Junio C Hamano <gits...@pobox.com> writes:

> Andres Perera <andre...@zoho.com> writes:
>> i just realized that there are ambiguities:
>> pull -r (true|false|preserve) foo
>> there are 2 ways to interpret this:
>> pull --rebase=(true|false|preserve) foo # pull from remote named foo
>> pull --rebase (true|false|preserve) foo # pull from remote named
>> (true|false|preserve), branch foo
>> options with optional operands usually require that the operands be
>> concatenated with the option argument.
> Yes.  This command line option should be like this:
>  - "--rebase" and "--no-rebase" are accepted as "true" and "false";
>  - "--rebase=preserve" should be the _only_ way to spell the new
>    mode of operation (if we were to add "--rebase=interactive"
>    later, that should follow suit); and
>  - "--rebase=true" and "--rebase=false" is nice to have for
>    consistency.
> Thanks.

Oh, another thing.

How should this interact with 949e0d8e (pull: require choice between
rebase/merge on non-fast-forward pull, 2013-06-27) which has been in
'next' and will likely to be one of the earlier topics to graduate
to 'master' after 1.8.4 is released?
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to