pinentry: switch to x11 as gtk-2 is dead

[home.git] / .gitconfig

diff --git a/.gitconfig b/.gitconfig
index 27f61cb05daa823ee62ab91a61ddb8e50402b096..bd5925d817edf22e18b78c884253df117a732418 100644 (file)
--- a/.gitconfig
+++ b/.gitconfig
@@ -23,11 +23,20 @@
 [diff]
        renames = true
 
+# Settings used by Chromium's `git cl`.  The defaults are brain-dead.
+[gerrit]
+       skip-ensure-authenticated = true
+       squash-uploads = false
+
 #[pager]
 #      diff = diff-highlight | less
 #      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
 
@@ -54,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