From c35c84a279cf39f36c6269836bcf11916f72081e Mon Sep 17 00:00:00 2001 From: Matan Rosenberg Date: Tue, 20 Apr 2021 09:49:23 +0300 Subject: [PATCH] Ignore checked-out branches on different worktrees --- bin/git-delete-merged-branches | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/git-delete-merged-branches b/bin/git-delete-merged-branches index fd8d38c..da93baf 100755 --- a/bin/git-delete-merged-branches +++ b/bin/git-delete-merged-branches @@ -1,6 +1,6 @@ #!/usr/bin/env bash -branches=$(git branch --no-color --merged | grep -v "\*" | grep -v $(git_extra_default_branch) | grep -v svn) +branches=$(git branch --no-color --merged | grep -vE "^(\*|\+)" | grep -v $(git_extra_default_branch) | grep -v svn) if [ -n "$branches" ] then echo "$branches" | xargs -n 1 git branch -d