Skip to content

Instantly share code, notes, and snippets.

@dagda1

dagda1/gitconfig

Created April 12, 2011 08:38
Show Gist options
  • Save dagda1/915188 to your computer and use it in GitHub Desktop.
Save dagda1/915188 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
gitconfig
[user]
email = [email protected]
name = paul.cowan
[core]
autocrlf = false
[merge]
tool = tortoisemerge
[mergetool "tortoisemerge"]
cmd = C:/Program Files/TortoiseGit/bin/TortoiseMerge.exe -base:$BASE -mine:$LOCAL -theirs:$REMOTE -merged:$MERGED
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment