Created
December 17, 2014 13:51
-
-
Save vintharas/6e49367f3c4aee081bb1 to your computer and use it in GitHub Desktop.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
[user] | |
name = Jaime González García | |
email = [email protected] | |
[alias] | |
st = status | |
ci = commit | |
co = checkout | |
lo = log | |
br = branch | |
lol = log --graph --decorate --pretty=oneline --abbrev-commit --all | |
l = log | |
lone = log -1 | |
d = difftool | |
laststashed = stash apply stash@{0} | |
slast = stash apply stash@{0} | |
sl = stash list | |
s = stash | |
cf = clean -f | |
cs = checkout -- . | |
cg = config --global | |
reb = rebase | |
hist = log --pretty=format:"%h %ad | %s%d [%an]" --graph --date=short | |
obliterate = !git clean -fd && git checkout -- . && echo "Everything has been obliterated, oh great master of evil and deceit!" | |
[color] | |
ui = true | |
[core] | |
editor = 'C:\\Program Files (x86)\\vim\\vim73\\gvim.exe' | |
autocrlf = false | |
[merge] | |
[mergetool "diffmerge"] | |
trustExitCode = true | |
cmd = 'C:\\Program Files\\SourceGear\\Common\\DiffMerge\\sgdm.exe' --merge --result=$MERGED $LOCAL $BASE $REMOTE | |
[diff] | |
[difftool "diffmerge"] | |
cmd = 'C:\\Program Files\\SourceGear\\Common\\DiffMerge\\sgdm.exe' $LOCAL $REMOTE | |
[merge] | |
[diff] | |
[credential] | |
[diff] | |
tool = diffmerge | |
[difftool] | |
prompt = false | |
[merge] | |
tool = diffmerge | |
[difftool "gvimdiff"] | |
[credential] | |
helper = !'C:\\Users\\jaimeg\\AppData\\Roaming\\GitCredStore\\git-credential-winstore.exe' | |
[push] | |
default = simple | |
[auto] | |
crlf = false |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment