summaryrefslogtreecommitdiff
path: root/.gitattributes
diff options
context:
space:
mode:
authorLibravatar Michael J Gruber <git@drmicha.warpmail.net>2014-12-08 17:28:45 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-12-09 16:27:47 -0800
commit356e91f2ecc581f3a446bba566ab1756dc57a583 (patch)
tree35f1aac2c1db40bc674773127cf0cd9452b8a0b8 /.gitattributes
parentt3200-branch: test -M (diff)
downloadtgif-356e91f2ecc581f3a446bba566ab1756dc57a583.tar.xz
branch: allow -f with -m and -d
-f/--force is the standard way to force an action, and is used by branch for the recreation of existing branches, but not for deleting unmerged branches nor for renaming to an existing branch. Make "-m -f" equivalent to "-M" and "-d -f" equivalent to" -D", i.e. allow -f/--force to be used with -m/-d also. For the list modes, "-f" is simply ignored. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions