diff options
| author | Ryan Styrczula <rmstyrczula@users.noreply.github.com> | 2019-08-23 11:05:11 -0400 |
|---|---|---|
| committer | Ryan Styrczula <rmstyrczula@users.noreply.github.com> | 2019-08-23 11:08:20 -0400 |
| commit | df9cf723963e38d152b750d85f0907b57dde53bb (patch) | |
| tree | afd695880fc1d4afff7466c861ff15f732ac997a | |
| parent | caf0bfa0461d5d787ab4f336139aadffcea379a9 (diff) | |
| download | zsh-df9cf723963e38d152b750d85f0907b57dde53bb.tar.gz zsh-df9cf723963e38d152b750d85f0907b57dde53bb.tar.bz2 zsh-df9cf723963e38d152b750d85f0907b57dde53bb.zip | |
plugins/git: Fix `gbda` trying to delete worktree branches
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
| -rw-r--r-- | plugins/git/README.md | 2 | ||||
| -rw-r--r-- | plugins/git/git.plugin.zsh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/plugins/git/README.md b/plugins/git/README.md index 3311ccf55..7878f747b 100644 --- a/plugins/git/README.md +++ b/plugins/git/README.md @@ -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 | diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh index 9787392de..2edee0298 100644 --- a/plugins/git/git.plugin.zsh +++ b/plugins/git/git.plugin.zsh @@ -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' |