X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=.gitconfig;h=77d72174644af0173e6720d85f84c27bcc1ec1b4;hb=fb5d2cb632ad05e57c8b257f5a3c85bb75c8ac31;hp=b3201a925db28b5845bf0ac0c97440dbb6ded26a;hpb=a78ac12120c3d7f88e53e5418f36d3b2f8c65a93;p=home.git

diff --git a/.gitconfig b/.gitconfig
index b3201a9..77d7217 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -28,15 +28,18 @@
 	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 +52,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
@@ -91,6 +100,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 +113,6 @@
 	suppressfrom = true
 	suppresscc = author
 	smtpserver = localhost:1111
+	transferEncoding = 8bit
+#	composeencoding = utf-8
+	assume8bitEncoding = 8bit