Differences

This shows you the differences between two versions of the page.

Link to this comparison view

Both sides previous revision Previous revision
docs:git:gitconfig [2012/09/21 23:11] billhdocs:git:gitconfig [2013/07/01 11:34] (current) billh
Line 29: Line 29:
 [difftool "winmerge"] [difftool "winmerge"]
  cmd = /cygdrive/h/git-difftool-wrapper.sh \"$LOCAL\" \"$REMOTE\"  cmd = /cygdrive/h/git-difftool-wrapper.sh \"$LOCAL\" \"$REMOTE\"
 +[gui]
 + gcwarning = false
 [merge] [merge]
  tool = tortoise  tool = tortoise
Line 38: Line 40:
  authorsfile = /cygdrive/c/htdocs/projects/svnusers.txt  authorsfile = /cygdrive/c/htdocs/projects/svnusers.txt
 </code> </code>
- 
  • docs/git/gitconfig.1348290671.txt.gz
  • Last modified: 2012/09/21 23:11
  • by billh