Re: [RFC/PATCH 2/2] branch: allow -f with -m and -d

2014-12-05 Thread Junio C Hamano
Michael J Gruber writes: >> What should "-f -u" and "-f -l" do, then, though? >> >>> list + unset_upstream > 1) >>> usage_with_options(builtin_branch_usage, options); >>> > > I would say there is nothing to force, so we ignore -f there. OK, and that is what the updated cod

Re: [RFC/PATCH 2/2] branch: allow -f with -m and -d

2014-12-05 Thread Michael J Gruber
Junio C Hamano schrieb am 04.12.2014 um 20:13: > Michael J Gruber writes: > >> -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"

Re: [RFC/PATCH 2/2] branch: allow -f with -m and -d

2014-12-04 Thread Junio C Hamano
Michael J Gruber writes: > -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.