add toni

diff --git a/.gitconfig b/.gitconfig
index 170d504461a21f720a53e343b5dcd1e6937730f0..dded6a955a69fdc68b1fe1a2c878a233e1834d2c 100644 (file)
--- a/.gitconfig
+++ b/.gitconfig
@@ -5,6 +5,9 @@
 [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]
@@ -28,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/"]
@@ -52,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]

diff --git a/.zsh/zshrc/parts.d/50-git b/.zsh/zshrc/parts.d/50-git
index da11bf80a96942309961035ff0dd75f872ee81e2..9419e15afc9ff72fc365513b97bb634489276982 100644 (file)
--- 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