Skip to content

Instantly share code, notes, and snippets.

@grahamsaulnier

grahamsaulnier/.gitconfig

Last active December 17, 2015 08:59
Show Gist options

  • Select an option

    Learn more about clone URLs
  • Save grahamsaulnier/5583677 to your computer and use it in GitHub Desktop.

Select an option

Learn more about clone URLs
Save grahamsaulnier/5583677 to your computer and use it in GitHub Desktop.
Download ZIP
storage of gitconfig
Raw
.gitconfig
[merge]
tool = kdiff3
[user]
name = Graham Saulnier
email = [email protected]
[core]
editor = "'C:/Program Files/Sublime Text 2/sublime_text.exe' -w"
autocrlf = false
filemode = false
[diff]
guitool = winmerge
[difftool "winmerge"]
path = C:/Program Files (x86)/WinMerge/winmergeu.exe
cmd = \"C:/Program Files (x86)/WinMerge/winmergeu.exe\" -e -u \"$LOCAL\" \"$REMOTE\"
[mergetool "kdiff3"]
path = D:/Program Files (x86)/KDiff3/kdiff3.exe
[mergetool "SemanticMerge"]
path = C:/Users/grahams/AppData/Local/PlasticSCM4/semanticmerge/semanticmergetool.exe
keepBackup = false
trustExitCode = false
cmd = \"C:/Users/grahams/AppData/Local/PlasticSCM4/semanticmerge/semanticmergetool.exe\" -b=\"$BASE\" -d=\"$LOCAL\" -s=\"$REMOTE\" -r=\"$MERGED\" -l=csharp -emt=\"mergetool.exe -b=\"\"@basefile\"\" -bn=\"\"@basesymbolic\"\" -s=\"\"@sourcefile\"\" -sn=\"\"@sourcesymbolic\"\" -d=\"\"@destinationfile\"\" -dn=\"\"@destinationsymbolic\"\" -r=\"\"@output\"\" -t=\"\"@filetype\"\" -i=\"\"@comparationmethod\"\" -e=\"\"@fileencoding\"\"\" -edt=\"mergetool.exe -s=\"\"@sourcefile\"\" -sn=\"\"@sourcesymbolic\"\" -d=\"\"@destinationfile\"\" -dn=\"\"@destinationsymbolic\"\" -t=\"\"@filetype\"\" -i=\"\"@comparationmethod\"\" -e=\"\"@fileencoding\"\"\"
[credential]
helper = !\"C:/Program Files (x86)/GitExtensions/GitCredentialWinStore/git-credential-winstore.exe\"
[difftool "sourcetree"]
cmd = 'C:/Program Files (x86)/KDiff3/kdiff3.exe' \"$LOCAL\" \"$REMOTE\"
[mergetool "sourcetree"]
cmd = 'C:/Program Files/PlasticSCM4/semanticmerge/semanticmergetool.exe' -b=\"$BASE\" -d=\"$LOCAL\" -s=\"$REMOTE\" -r=\"$MERGED\" -l=csharp -emt=\"mergetool.exe -b=\"\"@basefile\"\" -bn=\"\"@basesymbolic\"\" -s=\"\"@sourcefile\"\" -sn=\"\"@sourcesymbolic\"\" -d=\"\"@destinationfile\"\" -dn=\"\"@destinationsymbolic\"\" -r=\"\"@output\"\" -t=\"\"@filetype\"\" -i=\"\"@comparationmethod\"\" -e=\"\"@fileencoding\"\"\" -edt=\"mergetool.exe -s=\"\"@sourcefile\"\" -sn=\"\"@sourcesymbolic\"\" -d=\"\"@destinationfile\"\" -dn=\"\"@destinationsymbolic\"\" -t=\"\"@filetype\"\" -i=\"\"@comparationmethod\"\" -e=\"\"@fileencoding\"\"\"
trustExitCode = true
[alias]
lg = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment