X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=.gitconfig;h=27f61cb05daa823ee62ab91a61ddb8e50402b096;hb=0ac49f5f311144f34864ba06fcad6563f6bfe17b;hp=a62549f7907b59723231f2c82edc791f0a9834f7;hpb=a0b06b4fd2809798898c2ec746f7e0068f678793;p=home.git

diff --git a/.gitconfig b/.gitconfig
index a62549f..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,23 +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
-	b    = branch
+	am-a = am --abort
+	am-c = am --continue
+	ar   = archive
+	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
+	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
@@ -39,12 +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
-#	smtpserver = zeus.spd.analog.com