X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=.gitconfig;h=6ad94d24c7e4ff78333c00c408cb005ee29f5293;hb=6f92aeeb2e854f3daf6acd733ddfedcda42e7c8f;hp=0d8909995747b5c4207ad5072f81190619d34de8;hpb=5c21fd2518ead84426a76df0158f01f9daf4bc46;p=home.git

diff --git a/.gitconfig b/.gitconfig
index 0d89099..6ad94d2 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -3,6 +3,10 @@
 	email = vapier@gentoo.org
 #	signingkey = 0xE837F581
 
+[advice]
+	detachedHead = false
+	skippedCherryPicks = false
+
 [core]
 	abbrev = 12
 	pager = less -FRMX --tabs 4 -#10
@@ -23,6 +27,9 @@
 [diff]
 	renames = true
 
+[fetch]
+	parallel = 4
+
 # Settings used by Chromium's `git cl`.  The defaults are brain-dead.
 [gerrit]
 	skip-ensure-authenticated = true
@@ -52,8 +59,11 @@
 	bi   = bisect
 	cfg  = config
 	ci   = commit
-	cif  = commit --fixup
+	cia  = commit -a
+	ciaf = commit -a --fixup
 	ciam = commit --amend
+	ciaam = commit --amend -a
+	cif  = commit --fixup
 	co   = checkout
 	cp   = cherry-pick --ff
 	cp-a = cherry-pick --abort
@@ -68,6 +78,7 @@
 	h    = help
 	l    = log
 	lf   = log --format= --name-only
+	lp   = log -p
 	m    = merge --log=100 --no-stat
 	rb   = rebase
 	rb-d = rebase --committer-date-is-author-date
@@ -78,8 +89,9 @@
 	rl   = rev-list
 	se   = send-email -C -M
 	sm   = submodule
-	st   = status
+	st   = status -s
 	t    = tag
+	vl   = log --pretty='format:%Cred%h%Creset %Cgreen%ai%Creset %s%C(bold)%C(yellow)%d%Creset'
 
 [tag]
 	sort = version:refname