pinentry: switch to x11 as gtk-2 is dead

[home.git] / .gitconfig

diff --git a/.gitconfig b/.gitconfig
index 59a744845cb68c4a0c4ed6fb625deee4ce625060..bd5925d817edf22e18b78c884253df117a732418 100644 (file)
--- a/.gitconfig
+++ b/.gitconfig
@@ -33,6 +33,10 @@
 #      log  = diff-highlight | less
 #      show = diff-highlight | less
 
+[protocol]
+       # https://opensource.googleblog.com/2018/05/introducing-git-protocol-version-2.html
+       version = 2
+
 [push]
        default = current
 
@@ -59,7 +63,7 @@
        g    = grep
        h    = help
        l    = log
-       m    = merge
+       m    = merge --log
        rb   = rebase
        rb-d = rebase --committer-date-is-author-date
        rb-a = rebase --abort