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

diff --git a/.gitconfig b/.gitconfig
index 27f61cb..b3201a9 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -23,17 +23,25 @@
 [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
 
 [alias]
 	a    = add
-	ab   = abandon
 	am-a = am --abort
 	am-c = am --continue
 	ar   = archive
@@ -48,13 +56,13 @@
 	cp-x = cherry-pick -x
 	d    = diff
 	desc = describe
-	dl   = download
 	f    = fetch
 	fp   = format-patch -C -M
 	g    = grep
 	h    = help
 	l    = log
-	m    = merge
+	lf   = log --format= --name-only
+	m    = merge --log=100 --no-stat
 	rb   = rebase
 	rb-d = rebase --committer-date-is-author-date
 	rb-a = rebase --abort
@@ -66,7 +74,6 @@
 	sm   = submodule
 	st   = status
 	t    = tag
-	up   = upload
 
 [tag]
 	sort = version:refname