From dd768e5523542b20f62db5512586453b6cd4fbe5 Mon Sep 17 00:00:00 2001 From: "martin f. krafft" Date: Sun, 3 Nov 2019 00:01:11 +1300 Subject: [PATCH 1/8] remove restore alias --- .gitconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitconfig b/.gitconfig index 88d15e2..ee3ea53 100644 --- a/.gitconfig +++ b/.gitconfig @@ -8,7 +8,6 @@ [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 -- 2.39.2 From 821d3028f391ed1659186b68659d902dd0a2713e Mon Sep 17 00:00:00 2001 From: "martin f. krafft" Date: Mon, 6 Sep 2021 22:34:20 +1200 Subject: [PATCH 2/8] include merge commits in rebase --- .gitconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitconfig b/.gitconfig index ee3ea53..170d504 100644 --- a/.gitconfig +++ b/.gitconfig @@ -65,5 +65,7 @@ enabled = true [rebase] autosquash = true +[pull] + rebase = merges [advice] ignoredHook = false -- 2.39.2 From 552942f8982b70d66ac6c2f4ad9426801e388289 Mon Sep 17 00:00:00 2001 From: "martin f. krafft" Date: Mon, 6 Sep 2021 22:34:31 +1200 Subject: [PATCH 3/8] update prompt vars after git command runs --- .zsh/zshrc/parts.d/50-git | 7 +++++++ 1 file changed, 7 insertions(+) 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 -- 2.39.2 From 86b56b37fec583552cf2a8c184ad6732f0a98f8e Mon Sep 17 00:00:00 2001 From: "martin f. krafft" Date: Fri, 4 Aug 2023 22:04:08 +1200 Subject: [PATCH 4/8] configure sensible editor --- .gitconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitconfig b/.gitconfig index 170d504..be946c3 100644 --- a/.gitconfig +++ b/.gitconfig @@ -5,6 +5,7 @@ [core] pager = "less --quit-if-one-screen --raw-control-chars --no-init --hilite-search --SILENT" quotePath = false + editor = sensible-editor +start [diff] renames = copies [alias] -- 2.39.2 From e095c76b1317124386cf898529f4edc25fcc18f8 Mon Sep 17 00:00:00 2001 From: "martin f. krafft" Date: Fri, 4 Aug 2023 22:04:15 +1200 Subject: [PATCH 5/8] defalt branch becomes main --- .gitconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitconfig b/.gitconfig index be946c3..02ec332 100644 --- a/.gitconfig +++ b/.gitconfig @@ -6,6 +6,8 @@ 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] -- 2.39.2 From d32cdc55c2f0cb9793d0074fe940e0776c463f61 Mon Sep 17 00:00:00 2001 From: "martin f. krafft" Date: Thu, 26 Oct 2023 22:15:14 +0200 Subject: [PATCH 6/8] cleanup gui config --- .gitconfig | 2 -- 1 file changed, 2 deletions(-) diff --git a/.gitconfig b/.gitconfig index 02ec332..1978b30 100644 --- a/.gitconfig +++ b/.gitconfig @@ -31,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 -- 2.39.2 From da1d1fb7b107847a58217af385ac3c46748361c5 Mon Sep 17 00:00:00 2001 From: "martin f. krafft" Date: Thu, 26 Oct 2023 22:15:23 +0200 Subject: [PATCH 7/8] alioth is gone --- .gitconfig | 2 -- 1 file changed, 2 deletions(-) diff --git a/.gitconfig b/.gitconfig index 1978b30..2ea964f 100644 --- a/.gitconfig +++ b/.gitconfig @@ -37,8 +37,6 @@ 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/"] -- 2.39.2 From a4365937711b8e88c655fa8ed65dd966305de985 Mon Sep 17 00:00:00 2001 From: "martin f. krafft" Date: Thu, 26 Oct 2023 22:15:29 +0200 Subject: [PATCH 8/8] add toni --- .gitconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitconfig b/.gitconfig index 2ea964f..dded6a9 100644 --- a/.gitconfig +++ b/.gitconfig @@ -51,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] -- 2.39.2