X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=.gitconfig;h=bd5925d817edf22e18b78c884253df117a732418;hb=853a0c1f76ed7cb7e9bd6619b9e58b38cca1a1f0;hp=27f61cb05daa823ee62ab91a61ddb8e50402b096;hpb=454198a868b6fe5a6146376a9fdf063e1d0434cd;p=home.git

diff --git a/.gitconfig b/.gitconfig
index 27f61cb..bd5925d 100644
--- 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