Home Explore Help
Sign In
HonorLee
/
ohmyzsh
mirror of https://github.com/ohmyzsh/ohmyzsh.git
1
0
Fork 0
Files Issues 0 Wiki
Browse Source

git: fix `gbda` trying to delete worktree branches (#8102)

Git learned to add a `+` in front of branches that are
checked out in other worktrees.

See: https://github.com/git/git/blob/745f6812895b31c02b29bdfe4ae8e5498f776c26/Documentation/RelNotes/2.23.0.txt#L252-L256
Marc Cornellà 4 years ago
parent
caf0bfa046 df9cf72396
commit
d6fc6edb29
2 changed files with 2 additions and 2 deletions
Split View Show Diff Stats
  1. 1 1
      plugins/git/README.md
  2. 1 1
      plugins/git/git.plugin.zsh

+ 1 - 1
plugins/git/README.md
View File 

@@ -22,7 +22,7 @@ plugins=(... git)
 
 | gb                   | git branch                                                                                                                    |
 
 | gba                  | git branch -a                                                                                                                 |
 
 | gbd                  | git branch -d                                                                                                                 |
 
-| gbda                 | git branch --no-color --merged \| command grep -vE "^(\*\|\s*(master\|develop\|dev)\s*$)" \| command xargs -n 1 git branch -d |
 
+| gbda                 | git branch --no-color --merged \| command grep -vE "^(\+|\*\|\s*(master\|develop\|dev)\s*$)" \| command xargs -n 1 git branch -d |
 
 | gbD                  | git branch -D                                                                                                                 |
 
 | gbl                  | git blame -b -w                                                                                                               |
 
 | gbnm                 | git branch --no-merged                                                                                                        |

+ 1 - 1
plugins/git/git.plugin.zsh
View File 

@@ -42,7 +42,7 @@ alias gap='git apply'
 
 alias gb='git branch'
 
 alias gba='git branch -a'
 
 alias gbd='git branch -d'
 
-alias gbda='git branch --no-color --merged | command grep -vE "^(\*|\s*(master|develop|dev)\s*$)" | command xargs -n 1 git branch -d'
 
+alias gbda='git branch --no-color --merged | command grep -vE "^(\+|\*|\s*(master|develop|dev)\s*$)" | command xargs -n 1 git branch -d'
 
 alias gbD='git branch -D'
 
 alias gbl='git blame -b -w'
 
 alias gbnm='git branch --no-merged'