summaryrefslogtreecommitdiff
path: root/commit.c
diff options
context:
space:
mode:
authorMichael J Gruber <git@drmicha.warpmail.net>2014-12-08 16:28:45 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-12-10 00:27:47 (GMT)
commit356e91f2ecc581f3a446bba566ab1756dc57a583 (patch)
tree35f1aac2c1db40bc674773127cf0cd9452b8a0b8 /commit.c
parentff7aa81f8971daf29826b3881e0e2df5bd7df90c (diff)
downloadgit-356e91f2ecc581f3a446bba566ab1756dc57a583.zip
git-356e91f2ecc581f3a446bba566ab1756dc57a583.tar.gz
git-356e91f2ecc581f3a446bba566ab1756dc57a583.tar.bz2
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 'commit.c')
0 files changed, 0 insertions, 0 deletions