cc/cherry-pick-ff (Re: What's cooking in git.git (Mar 2010, #04; Tue, 16))

[Jonathan Nieder <jrnieder@gmail.com>]

Junio C Hamano wrote:

> * cc/cherry-pick-ff (2010-03-06) 7 commits
>   (merged to 'next' on 2010-03-07 at 5589b26)
>  + rebase -i: use new --ff cherry-pick option
>  + cherry-pick: add a no-op --no-ff option to future proof scripts
>  + Documentation: describe new cherry-pick --ff option
>  + cherry-pick: add tests for new --ff option
>  + revert: add --ff option to allow fast forward when cherry-picking
>  + builtin/merge: make checkout_fast_forward() non static
>  + parse-options: add parse_options_concat() to concat options
> 
> I think this is ready for 'master'; comments?

For what it’s worth, I am not convinced about the --no-ff option.  I do
not think --ff ever will be the default: for an operation that amounts
to applying a patch and making a new commit, it just feels wrong.

On the other hand, I have no objection to --no-ff as an undocumented
feature, to allow scripts using the flag to be backwards compatible.  If
--ff will become the default some day, we could start advertising the
--no-ff option as soon as we know that.  Why worry script authors and
use up space in the manual before then?

Just my two cents,
Jonathan