Skip to content

Instantly share code, notes, and snippets.

@Vintharas
Created December 17, 2014 13:51
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save Vintharas/6e49367f3c4aee081bb1 to your computer and use it in GitHub Desktop.
Save Vintharas/6e49367f3c4aee081bb1 to your computer and use it in GitHub Desktop.
[user]
name = Jaime González García
email = someemail@company.com
[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