X-Git-Url: https://git.madduck.net/etc/git.git/blobdiff_plain/3ee48d42342a85402ab1c3f72601bce544409864..da1d1fb7b107847a58217af385ac3c46748361c5:/.gitconfig?ds=inline

diff --git a/.gitconfig b/.gitconfig
index 40bfaca..2ea964f 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,16 +31,12 @@
 	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
 	interactive = auto
 	status = auto
 	ui = auto
-[url "ssh://git.debian.org/git/"]
-	insteadOf = alioth:
 [url "ssh://git@git.madduck.net/madduck/"]
 	insteadOf = madduck:
 [url "git://git.madduck.net/madduck/pub/"]
@@ -49,10 +47,6 @@
 	pushInsteadOf = git://git.madduck.net/madduck/pub/
 [url "ssh://git.madduck.net/madduck/pub/"]
 	insteadOf = madduck-pub:
-[url "ssh://git.gern.madduck.net/srv/git/"]
-	insteadOf = pmg:
-[url "ssh://shared.gern.madduck.net/srv/gern/"]
-	insteadOf = pm:
 [url "ssh://git@git.madduck.net/gitolite-admin"]
 	insteadOf = gitolite-admin:
 [url "ssh://git@admin.madduck.net/"]
@@ -70,3 +64,7 @@
 	enabled = true
 [rebase]
 	autosquash = true
+[pull]
+	rebase = merges
+[advice]
+	ignoredHook = false