Skip to content

Instantly share code, notes, and snippets.

@PhilMurwin
Last active December 7, 2016 19:40
Show Gist options
  • Save PhilMurwin/7f48e8041714af34921a98f54c6920e0 to your computer and use it in GitHub Desktop.
Save PhilMurwin/7f48e8041714af34921a98f54c6920e0 to your computer and use it in GitHub Desktop.
Custom Git config (minus user section)
[core]
editor = \"C:/Program Files (x86)/Programmer's Notepad/pn.exe\"
autocrlf = true
[merge]
tool = winmerge
[mergetool "winmerge"]
cmd = wMerge.sh \"$MERGED\" \"$REMOTE\"
path = c:/Program Files (x86)/winmerge/winmergeu.exe
[diff]
guitool = winmerge
[difftool]
prompt = true
[difftool "winmerge"]
path = C:/Program Files (x86)/WinMerge/winmergeu.exe
cmd = \"C:/Program Files (x86)/WinMerge/winmergeu.exe\" -e -u \"$LOCAL\" \"$REMOTE\"
[log]
date = relative
[push]
default = matching
[alias]
co = checkout
lg = log --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment