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

diff --git a/.gitconfig b/.gitconfig
index 53923dd..27f61cb 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,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
@@ -53,20 +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