X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=.gitconfig;h=59a744845cb68c4a0c4ed6fb625deee4ce625060;hb=832d50548e1041ffcacfbba17db4ed91d64de931;hp=e4af168e3ec4bf412985a404902c9c237293bd99;hpb=2f8ca74b8fb527128efb015202eff76e5094de7d;p=home.git

diff --git a/.gitconfig b/.gitconfig
index e4af168..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,30 +19,83 @@
 	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
-	b    = branch
+	ab   = abandon
+	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
 	rb-s = rebase --skip
 	rl   = rev-list
-	se   = send-email
+	se   = send-email -C -M
+	sm   = submodule
 	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