gitconfig: more settings

diff --git a/.gitconfig b/.gitconfig
index 61f69994a51fa3033adfeaee13aba1c2b83cccf3..8edb1270a4844cc8eed31c39f09ebe35e2cd6f6e 100644 (file)
--- a/.gitconfig
+++ b/.gitconfig
@@ -37,6 +37,9 @@
        # https://opensource.googleblog.com/2018/05/introducing-git-protocol-version-2.html
        version = 2
 
+[pull]
+       ff = only
+
 [push]
        default = current
 
@@ -49,6 +52,7 @@
        bi   = bisect
        cfg  = config
        ci   = commit
+       ciam = commit --amend
        co   = checkout
        cp   = cherry-pick --ff
        cp-a = cherry-pick --abort