From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 22 Dec 2014 20:27:36 +0000 (-0800)
Subject: Merge branch 'mg/branch-d-m-f'
X-Git-Tag: v2.3.0-rc0~51
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=15a171f6eb436f9a31986f78bbb115ed4540ad5b;p=thirdparty%2Fgit.git

Merge branch 'mg/branch-d-m-f'

"git branch -d" (delete) and "git branch -m" (move) learned to
honor "-f" (force) flag; unlike many other subcommands, the way to
force these have been with separate "-D/-M" options, which was
inconsistent.

* mg/branch-d-m-f:
  branch: allow -f with -m and -d
  t3200-branch: test -M
---

15a171f6eb436f9a31986f78bbb115ed4540ad5b