[user] name = Jeremy Kaplan email = jdkaplan@metagram.net [color] ui = true [push] default = simple [alias] ap = add -p b = branch bv = branch -v c = commit chk = commit -a -n -m 'CHECKPOINT' co = checkout cp = cherry-pick d = diff dc = diff --cached dn = diff --name-only --relative dw = diff --word-diff lg = log --graph --decorate --pretty='%C(auto)%h%d %s | %C(cyan)%cn%C(reset) %C(green)<%cr>%C(reset)' mb = merge-base HEAD rb = rebase root = rev-parse --show-toplevel s = status sb = show-branch [credential] helper = cache [commit] verbose = true [core] excludesfile = ~/.gitignore [includeIf "gitdir:~/projects/"] path = config-personal [merge] conflictStyle = diff3 [diff] wsErrorHighlight = all