From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 12 Feb 2021 22:21:04 +0000 (-0800)
Subject: Merge branch 'jk/complete-branch-force-delete'
X-Git-Tag: v2.31.0-rc0~50
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=006c5f79be55c029d6f68ea0d5a33cb41d1b5e80;p=thirdparty%2Fgit.git

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"
---

006c5f79be55c029d6f68ea0d5a33cb41d1b5e80