X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=.gitconfig;h=8edb1270a4844cc8eed31c39f09ebe35e2cd6f6e;hb=51dfa16b43d0f73ad56270d36a34b672a7de023a;hp=f8bfd579b27466817e7af0277803f81cbd281cec;hpb=0342453cae59711cc452aa428193af7d85394d0f;p=home.git

diff --git a/.gitconfig b/.gitconfig
index f8bfd57..8edb127 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,6 +52,7 @@
 	bi   = bisect
 	cfg  = config
 	ci   = commit
+	ciam = commit --amend
 	co   = checkout
 	cp   = cherry-pick --ff
 	cp-a = cherry-pick --abort
@@ -62,7 +66,7 @@
 	h    = help
 	l    = log
 	lf   = log --format= --name-only
-	m    = merge --log=50 --no-stat
+	m    = merge --log=100 --no-stat
 	rb   = rebase
 	rb-d = rebase --committer-date-is-author-date
 	rb-a = rebase --abort
@@ -91,6 +95,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 +108,6 @@
 	suppressfrom = true
 	suppresscc = author
 	smtpserver = localhost:1111
+	transferEncoding = 8bit
+#	composeencoding = utf-8
+	assume8bitEncoding = 8bit