X-Git-Url: https://git.madduck.net/etc/git.git/blobdiff_plain/716ecb8dd6c3b76822a26b09b2059d263b3fb4c3..ced2d0d4ce06f7c2a2e4bf2f0eb5b5951d8fd8b7:/.gitconfig

diff --git a/.gitconfig b/.gitconfig
index 88d15e2..28356db 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -5,15 +5,17 @@
 [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
 	sum = log --pretty=format:\"%h %Cblue%ci%Creset %Cgreen%cn%Creset %s\"
-	unstage = reset HEAD
+	unstage = restore --staged
 	sq = "!merge_squash_commit() { git merge --squash \"$1\" && git commit -m \"$1 squash\"; }; merge_squash_commit"
 	fixup = "!fixup_commit() { local c=\"$1\"; shift; git commit --fixup=\"$c\" \"$@\"; }; fixup_commit"
 	lst = "!cd $GIT_PREFIX && git status | grep -E --color=never -e '^([^[:space:]]|$|[[:space:]]+[^.( ])'"
@@ -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/"]
@@ -53,6 +51,8 @@
 	insteadOf = gitolite-admin:
 [url "ssh://git@admin.madduck.net/"]
 	insteadOf = sysadmin:
+[url "ssh://git@git.int.toni.immo/"]
+	insteadOf = toni:
 [push]
 	default = matching
 [sendemail]
@@ -66,5 +66,7 @@
 	enabled = true
 [rebase]
 	autosquash = true
+[pull]
+	rebase = merges
 [advice]
 	ignoredHook = false