[merge]
# use vimdiff as mergetool
tool = vimdiff
+ # this shows the ancestor
+ conflictstyle = diff3
[pretty]
compact = %C(auto)%h%Cgreen% cs%Cblue%<(15,trunc)% an%C(auto)%d%Creset% s
[push]
c = commit
ca = commit --all
+ caa = commit --all --amend
+ c-a = commit --amend
cm = commit --message
cam = commit --all --message
fix = commit --all --fixup