Skip to content

Instantly share code, notes, and snippets.

@zombor

zombor/.gitconfig

Created October 3, 2011 15:00
Show Gist options
  • Save zombor/1259294 to your computer and use it in GitHub Desktop.
Save zombor/1259294 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
.gitconfig
[user]
name = Jeremy Bush
email = [email protected]
[color]
diff = auto
status = auto
branch = auto
[core]
autocrlf = input
[mergetool "diffmerge"]
cmd = diffmerge --merge --result=$MERGED $LOCAL $BASE $REMOTE
trustExitCode = false
[merge]
tool = diffmerge
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment