Merge branch 'mg/branch-d-m-f'
commit15a171f6eb436f9a31986f78bbb115ed4540ad5b
authorJunio C Hamano <gitster@pobox.com>
Mon, 22 Dec 2014 20:27:36 +0000 (22 12:27 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 22 Dec 2014 20:27:36 +0000 (22 12:27 -0800)
treeec842014cc66b120d3923bcc01e7815dff84e7f0
parent00c194a819eb7ace8f7691adb3e47eca8b6472fb
parent356e91f2ecc581f3a446bba566ab1756dc57a583
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
builtin/branch.c
t/t3200-branch.sh