gitconfig

# vim:ft=gitconfig:
[include]
	path = ~/.gitlocalconfig
[user]
	email = andrei.glingeanu@gmail.com
	name = Andrei Glingeanu
[alias]
	# Fancy logging.
	#   h = head
	#   hp = head with patch
	#   r = recent commits, only current branch
	#   ra = recent commits, all reachable refs
	#   l = all commits, only current branch
	#   la = all commits, all reachable refs
	head = !git r -1
	h = !git head
	hp = "!. ~/.githelpers && show_git_head"
	r = !GIT_NO_PAGER=1 git l -30
	ra = !git r --all
	l = "!. ~/.githelpers && pretty_git_log"
	la = !git l --all
	show-files = "!f() { git diff-tree --no-commit-id --name-only -r $1; }; f"
[push]
	default = simple

[diff]
	tool = diffmerge
[difftool "diffmerge"]
	cmd = diffmerge \"$LOCAL\" \"$REMOTE\"
[merge]
	tool = diffmerge
[mergetool "diffmerge"]
	cmd = "diffmerge --merge --result=\"$MERGED\" \"$LOCAL\" \"$(if test -f \"$BASE\"; then echo \"$BASE\"; else echo \"$LOCAL\"; fi)\" \"$REMOTE\""
	trustExitCode = true
[branch]
	autosetuprebase = always
[core]
	excludesfile = ~/.gitignore
	autocrlf = input
[github]
	user = andreiglingeanu
[gpg]
	program = gpg