X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=.gitconfig;h=59a744845cb68c4a0c4ed6fb625deee4ce625060;hb=28101c227221b77566a9e3938508d930f26f9a69;hp=9dcfea20b5bed429fe9b5da7ea44b42f974559c6;hpb=db0968c66ff8e4cb583e132105d6f1fb2924d9c6;p=home.git

diff --git a/.gitconfig b/.gitconfig
index 9dcfea2..59a7448 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,11 +19,28 @@
 	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
+
 [push]
 	default = current
+
 [alias]
 	a    = add
 	ab   = abandon
+	am-a = am --abort
+	am-c = am --continue
 	ar   = archive
 	b    = branch -v
 	bi   = bisect
@@ -36,7 +60,8 @@
 	h    = help
 	l    = log
 	m    = merge
-	rb   = rebase --committer-date-is-author-date
+	rb   = rebase
+	rb-d = rebase --committer-date-is-author-date
 	rb-a = rebase --abort
 	rb-c = rebase --continue
 	rb-i = rebase --interactive
@@ -47,15 +72,30 @@
 	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
 	suppressfrom = true
+	suppresscc = author
 	smtpserver = localhost:1111