Skip to content

Instantly share code, notes, and snippets.

@wordijp
Last active March 24, 2016 17:37
Show Gist options
  • Save wordijp/dd8d9020ecf297c64879 to your computer and use it in GitHub Desktop.
Save wordijp/dd8d9020ecf297c64879 to your computer and use it in GitHub Desktop.
[color]
ui = auto
[alias]
ad = add
st = status
df = diff
cm = commit
co = checkout
br = branch
psh = push origin master
dfd = difftool -d
dfdc = difftool -d --cached
dfdp = difftool -d HEAD~
r = rebase
ri = rebase -i
rih2 = rebase -i HEAD~2
rih3 = rebase -i HEAD~3
rih4 = rebase -i HEAD~4
rih5 = rebase -i HEAD~5
rih6 = rebase -i HEAD~6
rih7 = rebase -i HEAD~7
rih8 = rebase -i HEAD~8
rih9 = rebase -i HEAD~9
[diff]
guitool = winmerge
tool = winmerge
[difftool "winmerge"]
path = E:/tool/favorite/WinMerge/WinMergeU.exe
cmd = \"E:/tool/favorite/WinMerge/WinMergeU.exe\" -e -x -ub -wl -dl \"Base\" -dr \"Mine\" \"$LOCAL\" \"$REMOTE\"
[mergetool "winmerge"]
path = E:/tool/favorite/WinMerge/WinMergeU.exe
cmd = \"E:/tool/favorite/WinMerge/WinMergeU.exe\" -e -x -ub -wl -dl \"Other\" -dm \"Merge\" -wr -dr \"Mine\" \"$LOCAL\" \"$BASE\" \"$REMOTE\" -o \"$MERGED\"
[core]
editor = \"E:/tool/Developer/GitExtensions/GitExtensions.exe\" fileeditor
autocrlf = false
excludesfile = ~/.gitignore
quotepath = false
[credential]
helper = !\"E:/tool/Developer/GitExtensions/GitCredentialWinStore/git-credential-winstore.exe\"
[user]
email = wordijp@example.com
name = wordi
[merge]
tool = kdiff3
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment