add aliases for amending

[user/henk/vcsh/git.git] / .config / git / config

diff --git a/.config/git/config b/.config/git/config
index bf56d483cc75a251837948a05bc46ec3e5107007..e064a37061a32e461860c8ee9ca7d58a1f19b0a9 100644 (file)
--- a/.config/git/config
+++ b/.config/git/config
@@ -1,7 +1,6 @@
-[user]
-  name = Hendrik Jäger
-  email = gitcommit@henk.geekmail.org
-  signingKey = 0x1B7EADFDDF720123
+[include]
+  # for [user] section with email, realname, signing key, etc
+  path = personal.conf
 
 [branch]
   # always make new branches rebase on their tracking branch
@@ -47,6 +46,8 @@
 [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]
@@ -88,6 +89,8 @@
 
   c     = commit
   ca    = commit --all
+  caa   = commit --all --amend
+  c-a   = commit --amend
   cm    = commit --message
   cam   = commit --all --message
   fix   = commit --all --fixup