X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=.gitconfig;h=3a0dc3ecc4b3a10f8443b3fc90607c20a97ad6c3;hb=c6a7a9dcb54abe1239b60c59b6180bab81e3ba65;hp=f8bfd579b27466817e7af0277803f81cbd281cec;hpb=0342453cae59711cc452aa428193af7d85394d0f;p=home.git

diff --git a/.gitconfig b/.gitconfig
index f8bfd57..3a0dc3e 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -3,6 +3,9 @@
 	email = vapier@gentoo.org
 #	signingkey = 0xE837F581
 
+[advice]
+	detachedHead = false
+
 [core]
 	abbrev = 12
 	pager = less -FRMX --tabs 4 -#10
@@ -23,20 +26,26 @@
 [diff]
 	renames = true
 
+[fetch]
+	parallel = 4
+
 # 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
+[pager]
+	diff = diff-highlight | less
+	log  = diff-highlight | less
+	show = diff-highlight | less
 
 [protocol]
 	# https://opensource.googleblog.com/2018/05/introducing-git-protocol-version-2.html
 	version = 2
 
+[pull]
+	ff = only
+
 [push]
 	default = current
 
@@ -49,12 +58,18 @@
 	bi   = bisect
 	cfg  = config
 	ci   = commit
+	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
 	cp-c = cherry-pick --continue
 	cp-x = cherry-pick -x
 	d    = diff
+	dc   = diff --cached
 	desc = describe
 	f    = fetch
 	fp   = format-patch -C -M
@@ -62,7 +77,8 @@
 	h    = help
 	l    = log
 	lf   = log --format= --name-only
-	m    = merge --log=50 --no-stat
+	lp   = log -p
+	m    = merge --log=100 --no-stat
 	rb   = rebase
 	rb-d = rebase --committer-date-is-author-date
 	rb-a = rebase --abort
@@ -72,8 +88,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
@@ -91,6 +108,9 @@
 	# https://groups.google.com/forum/m/#!topic/binary-transparency/f-BI4o8HZW0
 	fsckobjects = true
 
+[init]
+	defaultBranch = main
+
 [merge "merge-changelog"]
 	name = GNU-style ChangeLog merge driver
 	driver = /usr/bin/git-merge-changelog %O %A %B
@@ -101,3 +121,6 @@
 	suppressfrom = true
 	suppresscc = author
 	smtpserver = localhost:1111
+	transferEncoding = 8bit
+#	composeencoding = utf-8
+	assume8bitEncoding = 8bit