Skip to content

Instantly share code, notes, and snippets.

@cheeaun

cheeaun/.gitconfig

Created February 8, 2009 14:49
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save cheeaun/60399 to your computer and use it in GitHub Desktop.
Save cheeaun/60399 to your computer and use it in GitHub Desktop.
Download ZIP
.gitconfig with custom merge tools
Raw
.gitconfig
[user]
email = email@email.com
name = Your Name
[core]
autocrlf = false
[merge]
tool = diffmerge
[mergetool "tortoisemerge"]
cmd = C:/Program\\ Files/TortoiseSVN/bin/TortoiseMerge.exe /base:\"$BASE\" /mine:\"$LOCAL\" /theirs:\"$REMOTE\" /merged:\"$MERGED\"
keepBackup = false
trustExitCode = false
[mergetool "diffmerge"]
cmd = D:/Program\\ Files/diffmerge/DiffMerge.exe \"$PWD/$BASE\" \"$PWD/$REMOTE\" \"$PWD/$LOCAL\" /r=\"$PWD/$MERGED\"
keepBackup = false
trustExitCode = false
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment