diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2021-02-12 14:21:04 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-02-12 14:21:04 -0800 |
| commit | 006c5f79be55c029d6f68ea0d5a33cb41d1b5e80 (patch) | |
| tree | 79a0fbcf86b3d25dc2480893b764194358fb3c01 /contrib | |
| parent | Merge branch 'jv/upload-pack-filter-spec-quotefix' (diff) | |
| parent | doc/git-branch: fix awkward wording for "-c" (diff) | |
| download | tgif-006c5f79be55c029d6f68ea0d5a33cb41d1b5e80.tar.xz | |
Merge branch 'jk/complete-branch-force-delete'
The command line completion (in contrib/) completed "git branch -d"
with branch names, but "git branch -D" offered tagnames in addition,
which has been corrected. "git branch -M" had the same problem.
* jk/complete-branch-force-delete:
doc/git-branch: fix awkward wording for "-c"
completion: handle other variants of "branch -m"
completion: treat "branch -D" the same way as "branch -d"
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/completion/git-completion.bash | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 4b1f4264a6..7dc6cd8eb8 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -1447,8 +1447,10 @@ _git_branch () while [ $c -lt $cword ]; do i="${words[c]}" case "$i" in - -d|--delete|-m|--move) only_local_ref="y" ;; - -r|--remotes) has_r="y" ;; + -d|-D|--delete|-m|-M|--move|-c|-C|--copy) + only_local_ref="y" ;; + -r|--remotes) + has_r="y" ;; esac ((c++)) done |