X-Git-Url: https://git.wh0rd.org/?p=home.git;a=blobdiff_plain;f=.gitconfig;h=27f61cb05daa823ee62ab91a61ddb8e50402b096;hp=77ab2cc1d1f17e0c2aef266cf6da0f91f2628e9d;hb=53756ed8612888ef97a5c39a83e9ceaaed56ac91;hpb=70f4d7c07a907c6078b0012a2963207015796f90

diff --git a/.gitconfig b/.gitconfig
index 77ab2cc..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,26 +19,44 @@
 	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
+	b    = branch -v
 	bi   = bisect
 	cfg  = config
 	ci   = commit
 	co   = checkout
-	cp   = cherry-pick
+	cp   = cherry-pick --ff
+	cp-a = cherry-pick --abort
+	cp-c = cherry-pick --continue
+	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
 	rb   = rebase
+	rb-d = rebase --committer-date-is-author-date
 	rb-a = rebase --abort
 	rb-c = rebase --continue
 	rb-i = rebase --interactive
@@ -42,11 +67,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