X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=.gitconfig;h=bd5925d817edf22e18b78c884253df117a732418;hb=058dcf5293c734d5f5c066ed2b3d79eb2fc35d94;hp=a45d134b0b779578ebf070600f359fc3291d2dcc;hpb=f473de80078d17a4b8bf13f37b4df0def90d197f;p=home.git

diff --git a/.gitconfig b/.gitconfig
index a45d134..bd5925d 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -1,10 +1,17 @@
 [user]
 	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
@@ -12,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
@@ -37,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
@@ -50,15 +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