X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=.gitconfig;h=19d575c8ec912c18718bd78f29107b2b7ea116df;hb=4db942a3f9bac7bb2c02ccf31984486feb368ef3;hp=4be988b20d40096d904fc1f09020fbf79be45675;hpb=81027099888b5a55180415902e23a499c91792b0;p=home.git

diff --git a/.gitconfig b/.gitconfig
index 4be988b..19d575c 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -2,12 +2,16 @@
 	name = Mike Frysinger
 	email = vapier@gentoo.org
 #	signingkey = 0xE837F581
+
 [core]
 	abbrev = 12
+	pager = less -FRMX --tabs 4 -#10
+
 [color]
 	ui = auto
 	diff = auto
 	status = auto
+
 [color "diff"]
 	old = red bold
 	new = green bold
@@ -15,13 +19,32 @@
 	frag = yellow bold
 	whitespace = normal green
 	meta = magenta
+
 [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
 	b    = branch -v
 	bi   = bisect
@@ -53,18 +76,27 @@
 	st   = status
 	t    = tag
 	up   = upload
+
 [tag]
 	sort = version:refname
+
 [merge]
 	conflictstyle = diff3
+
 [rebase]
 	autosquash = true
+
+[http]
+	cookiefile = ~/.gitcookies
+
 [transfer]
 	# https://groups.google.com/forum/m/#!topic/binary-transparency/f-BI4o8HZW0
 	fsckobjects = true
+
 [merge "merge-changelog"]
 	name = GNU-style ChangeLog merge driver
 	driver = /usr/bin/git-merge-changelog %O %A %B
+
 [sendemail]
 	chainreplyto = false
 	confirm = always