Skip to content

Instantly share code, notes, and snippets.

@letoh
Created March 17, 2015 04:19
Show Gist options
  • Save letoh/39973ffc737ae406a4ee to your computer and use it in GitHub Desktop.
Save letoh/39973ffc737ae406a4ee to your computer and use it in GitHub Desktop.
gitconfig
[alias]
st = status
ci = commit
co = checkout
up = checkout
br = branch -v
cia = commit -a
di = diff --color
gr = grep -n
log1 = log --pretty=format:"%h %ad | %s%d [%an]" --graph --date=short
log2 = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(cyan)<%an>%Creset' --abbrev-commit --date=relative
log3 = log --graph --decorate --pretty=oneline --abbrev-commit
[color "branch"]
current = yellow reverse
local = yellow
remote = green
[color "diff"]
meta = yellow bold
frag = magenta bold
old = red bold
new = green bold
[color "status"]
added = yellow
changed = green
untracked = cyan
[color "grep"]
match = yellow
function = green
linenumber = red
[color]
diff = auto
status = auto
branch = auto
grep = auto
[merge]
tool = ediff3
[mergetool "vimdiff3"]
cmd = vim -f -d -c \"wincmd J\" \"$MERGED\" \"$LOCAL\" \"$BASE\" \"$REMOTE\"
[mergetool "ediff3"]
cmd = emacs -q --eval \"(ediff-merge-with-ancestor \\\"$REMOTE\\\" \\\"$LOCAL\\\" \\\"$BASE\\\" nil \\\"$MERGED\\\")\"
[push]
default = simple
[log]
abbrevCommit = true
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment