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

diff --git a/.gitconfig b/.gitconfig
index a45d134..27f61cb 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,23 @@
 	frag = yellow bold
 	whitespace = normal green
 	meta = magenta
+
 [diff]
 	renames = true
+
+#[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
@@ -50,15 +67,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