Skip to content

Instantly share code, notes, and snippets.

@brodock
Last active October 6, 2015 14:18
Show Gist options
  • Save brodock/3006357 to your computer and use it in GitHub Desktop.
Save brodock/3006357 to your computer and use it in GitHub Desktop.
.gitconfig
[user]
name = Gabriel Mazetto
email = brodock@gmail.com
[color]
ui = auto
diff = auto
status = auto
[alias]
co = checkout
cm = commit
st = status
ld = log --stat --graph
ls = log --stat
ft = fetch --verbose
dp = diff -p --raw --binary
dc = diff --cached
lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative
who = shortlog -sn
pullr = pull --rebase
pushf = push --force-with-lease
merged = branch --merged
nomerged = branch --no-merged
delete-merged-branches = "!f() { git checkout --quiet master && git branch --merged | grep --invert-match '\\*' | xargs -n 1 git branch --delete; git checkout --quiet @{-1}; }; fi"
[diff]
tool = diffmerge
[difftool "diffmerge"]
cmd = diffmerge \"$LOCAL\" \"$REMOTE\"
[merge]
tool = diffmerge
[mergetool "diffmerge"]
cmd = diffmerge --merge --result=\"$MERGED\"\n\"$LOCAL\" \"$BASE\" \"$REMOTE\"
trustexitcode = false
[fetch]
recurseSubmodules = on-demand
prune = true
[push]
default = matching
[status]
submodulesummary = 1
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment