.gitconfig

[core]
	editor = vim

[push]
	# do everyone a favor:
	default = simple

#[merge]
	#tool = vimdiff

[color]
	branch = yes
	diff   = yes
	status = yes
	interactive = true

[alias]
	### CHECKING OUT
	br  = branch
	co  = checkout
	# pull requests
	pr = "!git checkout -b $1 pull/origin/$1 #"

	### MAKING HISTORY
	ci  = commit -v
	cp  = cherry-pick

	### UPDATING
	up = "!git remote update -p; git merge --ff-only @{u}"
	rup = remote update -p
	pullf = pull --ff-only

	### INSPECTING
	# diffs
	di  = diff 
	dih = diff HEAD
	dis = diff --staged
	diw = diff --color-words
	dc = diff --staged # show staged commits                                                               
	# divergence between local and upstream
	div = show-branch --current @{u}
	sb  = show-branch
	# logs
	lo  = log --decorate --graph
	lc = log ORIG_HEAD.. --stat --no-merges                                            
	gl = log --oneline --decorate --stat --graph    
	# log all
	loa = log --decorate --graph --all
	# log upstream
	lou = log --decorate --graph @{u}
	# inspecting: status
	st  = status # -s -b
	sta = status

	### MISC
	# open branch on GitHub
	hub = !~/git-hub
	# export as archive
	export = !~/src/bin/git-export
	# serve repo
	serve = !git daemon --reuseaddr --verbose  --base-path=. --export-all ./.git