X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=.gitconfig;h=61f69994a51fa3033adfeaee13aba1c2b83cccf3;hb=6ba00e98257c3777c63600b1af5356d5fb73f881;hp=d29de085927a82f4972a2bd509aa4aa195893b77;hpb=64e2994fd8fa22f90bf017c8f5719a6ca7d17b43;p=home.git

diff --git a/.gitconfig b/.gitconfig
index d29de08..61f6999 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -28,10 +28,10 @@
 	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
@@ -42,7 +42,6 @@
 
 [alias]
 	a    = add
-	ab   = abandon
 	am-a = am --abort
 	am-c = am --continue
 	ar   = archive
@@ -57,14 +56,13 @@
 	cp-x = cherry-pick -x
 	d    = diff
 	desc = describe
-	dl   = download
 	f    = fetch
 	fp   = format-patch -C -M
 	g    = grep
 	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
@@ -76,7 +74,6 @@
 	sm   = submodule
 	st   = status
 	t    = tag
-	up   = upload
 
 [tag]
 	sort = version:refname
@@ -94,6 +91,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
@@ -104,3 +104,6 @@
 	suppressfrom = true
 	suppresscc = author
 	smtpserver = localhost:1111
+	transferEncoding = 8bit
+#	composeencoding = utf-8
+	assume8bitEncoding = 8bit