Created
August 20, 2015 04:25
-
-
Save taisyo7333/afeb56d49d95061a547a to your computer and use it in GitHub Desktop.
My .gitconfig
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
[merge] | |
tool = WinMerge | |
[mergetool "WinMerge"] | |
cmd = \"C:/Program Files/WinMerge/WinMergeU.exe\" //e //u //wl //wr \"$LOCAL\" \"$BASE\" \"$REMOTE\" //o \"$MERGED\" | |
trustExitCode = true | |
[mergetool "kdiff3"] | |
path = C:/Program Files/KDiff3/kdiff3.exe | |
[diff] | |
guitool = winmerge | |
[difftool "kdiff3"] | |
path = C:/Program Files/KDiff3/kdiff3.exe | |
[core] | |
editor = \"C:/Program Files/GitExtensions/GitExtensions.exe\" fileeditor | |
autocrlf = true | |
quotepath = false | |
[credential] | |
helper = !\\\"C:/Program Files/GitExtensions/GitCredentialWinStore/git-credential-winstore.exe\\\" | |
[difftool "winmerge"] | |
path = C:/Program Files/WinMerge/winmergeu.exe | |
cmd = \"C:/Program Files/WinMerge/winmergeu.exe\" -e -u \"$LOCAL\" \"$REMOTE\" | |
[push] | |
default = matching | |
[difftool "sourcetree"] | |
cmd = 'c:/Program Files/WinMerge/WinMergeU.exe' \"$LOCAL\" \"$REMOTE\" | |
[mergetool "sourcetree"] | |
cmd = 'C:/Program Files/KDiff3/kdiff3.exe' \"$BASE\" \"$LOCAL\" \"$REMOTE\" -o \"$MERGED\" | |
trustExitCode = true | |
cmd = '/C:/Program | |
cmd = 'C:/Program | |
cmd = 'C:/Program |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment