Git aliases, and Bash aliases for Git

.aliases

# go to git root
alias gu='cd $(git rev-parse --show-cdup)'

.gitconfig

[alias]
	co = checkout
	s = status
	r = rebase
	f = fetch
	l = log
	md = branch -a --merged
	si = submodule update --init
	mt = mergetool

	# show all commits not shared between two branches
	# usage: git ld leftbranch...rightbranch
	ld = log --cherry-pick --oneline --left-right

	# open all conflicting files in Vim, searching for conflicts
	vc = !vim +'/^[<=>]\\{7}' $(git status | grep 'both \\(modified\\|added\\):' | perl -pe 's/^.*both (modified|added):\\s+(.*)$/$2/')