From: Paolo Bonzini <bonzini@gnu.org>
Date: Sat, 06 Feb 2010 09:40:11 GMT
Subject: Re: [PATCH 5/9] revert: add --ff option to allow fast forward when cherry-picking
Message-ID: <4B6D38FB.9000307@gnu.org>
In-Reply-To: <20100205231112.3689.67634.chriscool@tuxfamily.org>

On 02/06/2010 12:11 AM, Christian Couder wrote:
> As "git merge" fast forwards if possible, it seems sensible to
> have such a feature for "git cherry-pick" too, especially as it
> could be used in git-rebase--interactive.sh.
>
> Maybe this option could be made the default in the long run, with
> another --no-ff option to disable this default behavior, but that
> could make some scripts backward incompatible and/or that would
> require testing if some GIT_AUTHOR_* environment variables are
> set. So we don't do that for now.

I would still like to have a no-op --no-ff so that scripts that do rely 
on that can be future proofed (or also, scripts that do "git cherry-pick 
$blah -e COMMIT" could use --no-ff to avoid errors in case $blah 
contains --ff).

Paolo