From: martin f. krafft <madduck@madduck.net>
Date: Thu, 26 Oct 2023 20:15:29 +0000 (+0200)
Subject: add toni
X-Git-Url: https://git.madduck.net/etc/git.git/commitdiff_plain/HEAD?hp=716ecb8dd6c3b76822a26b09b2059d263b3fb4c3;ds=sidebyside

add toni
---

diff --git a/.gitconfig b/.gitconfig
index 88d15e2..dded6a9 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/"]
@@ -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
diff --git a/.zsh/zshrc/parts.d/50-git b/.zsh/zshrc/parts.d/50-git
index da11bf8..9419e15 100644
--- a/.zsh/zshrc/parts.d/50-git
+++ b/.zsh/zshrc/parts.d/50-git
@@ -60,6 +60,13 @@ __git_set_prompt_variable() {
 add-zsh-hook chpwd __git_set_prompt_variable
 __git_set_prompt_variable
 
+__update_git_prompt_vars_if_git_ran() {
+  case "$(history $(($HISTCMD - 1)))" in
+    *git*) __git_set_prompt_variable
+  esac
+}
+add-zsh-hook precmd __update_git_prompt_vars_if_git_ran
+
 __git_print_preprompt()
 {
   [[ $? -eq 0 ]] || return