| commit | bd90a7217b570634e94bf02df1646af0e69a511f | |
| author | Michael J Gruber <git@drmicha.warpmail.net> | |
| Tue, 5 Apr 2011 08:59:08 +0000 (5 10:59 +0200) | ||
| committer | Michael J Gruber <git@drmicha.warpmail.net> | |
| Tue, 5 Apr 2011 08:59:08 +0000 (5 10:59 +0200) | ||
| tree | 2b6a04506614ba89d194516bedb389b1b40920f4 | treesnapshot (tar.gz zip) |
| parent | 6aabe289a42121b138aa64253b432e71b629cbcc | commitdiff |
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.
Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
-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.
Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
| builtin/branch.c | diffblobblamehistory | |
| t/t3200-branch.sh | diffblobblamehistory |