From 78774091243b348f80a684e81935ef4112abc4a0 Mon Sep 17 00:00:00 2001 From: Loic Nageleisen Date: Wed, 12 Mar 2025 13:37:24 +0100 Subject: [PATCH 1/3] Handle branches better with git lint --- home/gitconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/gitconfig b/home/gitconfig index 509c8e8..887db8c 100644 --- a/home/gitconfig +++ b/home/gitconfig @@ -40,7 +40,7 @@ save = !git add -A && git commit -m 'SAVEPOINT' undo = reset HEAD~1 --mixed backup = !git push origin/backup/$(whoami)/$(git branch) - lint = !git branch --merged | grep -v \"^\\s*master$\" | grep -v \"\\*\" | xargs -n 1 git branch -d + lint = !git branch --merged ${1-} | grep -v -E -e '^[*]?[ ]*(main|master|[0-9]+[.]([0-9]+|x)-stable)$' -e '^[*][ ]+' | xargs -r -n 1 git branch -d modified = !git status --porcelain | perl -ne '/^M (.*)/ and print \"$1\\n\"' conflicts = !git status --porcelain | perl -ne '/^UU (.*)/ and print \"$1\\n\"' fetch-pr = !git fetch origin pull/${1}/head:pr/${1} From 25de733bcf5cde9a79b734bb34a6e194001fce0c Mon Sep 17 00:00:00 2001 From: Loic Nageleisen Date: Wed, 12 Mar 2025 13:38:35 +0100 Subject: [PATCH 2/3] Add insteadOf for github --- home/gitconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/home/gitconfig b/home/gitconfig index 887db8c..779714c 100644 --- a/home/gitconfig +++ b/home/gitconfig @@ -16,6 +16,7 @@ ff = only [url "git@github.com:"] pushInsteadOf = https://github.com/ + insteadOf = https://github.com/ [url "git@gitlab.com:"] pushInsteadOf = https://gitlab.com/ [url "git@gitlab.adhoc-gti.com:"] From 1c49ca503aa49710a2ce2fb02d79ab86587a3f5f Mon Sep 17 00:00:00 2001 From: Loic Nageleisen Date: Wed, 12 Mar 2025 13:39:14 +0100 Subject: [PATCH 3/3] Disable auto docker feature --- shell/docker | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 shell/docker diff --git a/shell/docker b/shell/docker old mode 100755 new mode 100644