Skip to content

Instantly share code, notes, and snippets.

@robertpateii
Created July 9, 2013 15:59
Show Gist options
  • Save robertpateii/5958569 to your computer and use it in GitHub Desktop.
Save robertpateii/5958569 to your computer and use it in GitHub Desktop.
My Git config file.
[user]
name = Robert Pate
email = ---------------
[core]
editor=vim
[merge]
tool = winmerge
[mergetool "winmerge"]
cmd = \"C:/Program Files (x86)/winmerge/winmergeu.exe\" \"$MERGED\"
path = C:/Program Files (x86)/winmerge/winmergeu.exe
[mergetool]
keepBackup = false
trustExitCode = false
[diff]
tool = winmerge
guitool = winmerge
[difftool "winmerge"]
cmd = \"C:/Program Files (x86)/winmerge/winmergeu.exe\" \"$LOCAL\" \"$REMOTE\"
path = C:/Program Files (x86)/winmerge/winmergeu.exe
[alias]
st = status -sb
ci = commit
br = branch
co = checkout
df = difftool
ready = rebase -i @{u}
lg = log --pretty=format:'%C(cyan)%h%Creset -%Creset %s %C(green)(%cr) %C(white)<%an>%Creset'
standup = log --since yesterday --author 'git config user.email' --pretty=short
purr = pull --rebase
ignored = ls-files --others -i --exclude-standard
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment