Skip to content

Instantly share code, notes, and snippets.

@thitemple
Last active December 21, 2015 16:29
Show Gist options
  • Save thitemple/6333962 to your computer and use it in GitHub Desktop.
Save thitemple/6333962 to your computer and use it in GitHub Desktop.
My git config file
[alias]
aa = add --all .
st = status
br = branch
cl = clone
co = checkout
ci = commit
sr = svn rebase
sci = svn dcommit
fu = reset --hard
lg = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --
pu = !"git fetch origin -v; git fetch upstream -v; git merge upstream/master"
pom = !"git push origin master"
[merge]
tool = winmerge
[core]
autocrlf = True
excludesfile = "~/.gitexcludes"
[diff]
guitool = winmerge
[difftool "winmerge"]
path = "C:/Program Files (x86)/WinMerge/WinMergeU.exe"
[mergetool "winmerge"]
path = "C:/Program Files (x86)/WinMerge/WinMergeU.exe"
[svn]
rmdir = true
[svn]
rmdir = true
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment