[alias] b = branch camend = commit --amend -C HEAD checkin = commit ci = commit co = checkout d = diff dc = diff --cached dshow = show --decorate l = log --decorate l1 = log --decorate --oneline l5 = log --decorate -5 lg = log --decorate --graph lg1 = log --decorate --graph --oneline lg5 = log --decorate --graph -5 lr = log --decorate --reverse lr1 = log --decorate --reverse --oneline lr5 = log --decorate --reverse -5 root = rev-parse --show-toplevel #root = !pwd st = status --short stb = status --short --branch unstage = reset HEAD -- wdiff = diff --word-diff wshow = show --word-diff --decorate [branch] autosetuprebase = always [color] ui = auto [include] path = ~/lib/config/git/light_bg [log] abbrevCommit = true [merge] tool = vimdiff #[mergetool "vimdiff3"] # Don't forget to add -f for gvim # 3 way diffs # cmd = vim -d \"$MERGED\" \"$LOCAL\" \"$BASE\" \"$REMOTE\" -c \"wincmd J\" [receive] denyNonFastForwards = true [web] browser = webbrowser [browser "webbrowser"] cmd = webbrowser -n [gui] fontui = -family \"DejaVu Sans\" -size 18 -weight normal -slant roman -underline 0 -overstrike 0 fontdiff = -family \"DejaVu Sans Mono\" -size 18 -weight normal -slant roman -underline 0 -overstrike 0