Merge branch 'jk/complete-branch-force-delete'
commit006c5f79be55c029d6f68ea0d5a33cb41d1b5e80
authorJunio C Hamano <gitster@pobox.com>
Fri, 12 Feb 2021 22:21:04 +0000 (12 14:21 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 12 Feb 2021 22:21:04 +0000 (12 14:21 -0800)
tree79a0fbcf86b3d25dc2480893b764194358fb3c01
parent60f81219403d708ab6271f68d8e4e42a39f7459b
parent27dc071b9a11e953ea7d73bfdf6103940d039215
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"
contrib/completion/git-completion.bash