X-Git-Url: https://git.madduck.net/etc/git.git/blobdiff_plain/716ecb8dd6c3b76822a26b09b2059d263b3fb4c3..d32cdc55c2f0cb9793d0074fe940e0776c463f61:/.gitconfig?ds=sidebyside

diff --git a/.gitconfig b/.gitconfig
index 88d15e2..1978b30 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -5,10 +5,12 @@
 [core]
 	pager = "less --quit-if-one-screen --raw-control-chars --no-init --hilite-search --SILENT"
 	quotePath = false
+	editor = sensible-editor +start
+[init]
+	defaultBranch = main
 [diff]
 	renames = copies
 [alias]
-	restore = checkout HEAD
 	dist = "!git archive --format=tar -v --prefix=$(git describe HEAD | sed -e 's,-,///,;s,-,+,g;s,///,-,')/ HEAD | gzip -9 > ../$(git describe HEAD | sed -e 's,-,///,;s,-,+,g;s,///,-,').tar.gz"
 	ddist = "!git dist && mv ../$(git describe HEAD | sed -e 's,-,///,;s,-,+,g;s,///,-,').tar.gz ../$(git describe HEAD | sed -e 's,-,_,;s,-,+,g').orig.tar.gz"
 	files = ls-files -v --deleted --modified --others --directory --no-empty-directory --exclude-standard
@@ -29,8 +31,6 @@
 	driver = dpkg-mergechangelogs -m %O %A %B %A
 [diff]
 	tool = vimdiff
-[gui]
-	fontui = -family rotissansserif -size 10 -weight bold -slant roman -underline 0 -overstrike 0
 [color]
 	branch = auto
 	diff = auto
@@ -66,5 +66,7 @@
 	enabled = true
 [rebase]
 	autosquash = true
+[pull]
+	rebase = merges
 [advice]
 	ignoredHook = false