From 169933d06a09f3db953b44a159d6f12c01cf3b0c Mon Sep 17 00:00:00 2001 From: Yax <1949284+kianby@users.noreply.github.com> Date: Thu, 25 Nov 2021 16:51:52 +0100 Subject: [PATCH] git fetch --prune and don't exclude master from git track --- dot_gitconfig.tmpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dot_gitconfig.tmpl b/dot_gitconfig.tmpl index d593b53..a57d278 100644 --- a/dot_gitconfig.tmpl +++ b/dot_gitconfig.tmpl @@ -13,12 +13,12 @@ cd = checkout develop cm = checkout master cp = cherry-pick - f = fetch + f = fetch -p m = merge nb = checkout -b p = push -u origin s = status - track = "!for BRANCH in $(git branch -a | grep remotes | grep -v HEAD | grep -v master); do git branch --track \"${BRANCH#remotes/origin/}\" \"${BRANCH}\"; done" + track = "!for BRANCH in $(git branch -a | grep remotes | grep -v HEAD); do git branch --track \"${BRANCH#remotes/origin/}\" \"${BRANCH}\"; done" untrack = "!for BRANCH in $(git branch | grep -v '*'); do git branch -D \"${BRANCH}\"; done" work-in-progress = rebase -i @{u} [include]