gistfile1.txt

[alias]
	st = status
  br = branch
	co = checkout
	unstage = reset HEAD
  # http://www.jukie.net/bart/blog/git-amend
	amend = commit --amend -C HEAD

[color]
	ui = auto
[rerere]
	enabled = 1
[core]
	excludesfile = /Users/flevour/.gitignore_global
	autocrlf = input
[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
[diff]
	tool = diffmerge
[difftool "diffmerge"]
	cmd = diffmerge \"$LOCAL\" \"$REMOTE\"