From: Paolo Bonzini <bonzini@gnu.org>
To: git@vger.kernel.org
Subject: Re: [PATCH 5/9] revert: add --ff option to allow fast forward when cherry-picking
Date: Sat, 06 Feb 2010 16:41:43 +0100 [thread overview]
Message-ID: <hkk2jl$ghl$1@ger.gmane.org> (raw)
In-Reply-To: <201002061629.05640.chriscool@tuxfamily.org>
On 02/06/2010 04:29 PM, Christian Couder wrote:
> On samedi 06 février 2010, Paolo Bonzini wrote:
>> 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).
>
> Ok, I will add a --no-ff option but I think it should be incompatible
> with --ff rather than overide it.
Whatever it does it should be the same as git merge.
Paolo
next prev parent reply other threads:[~2010-02-06 15:42 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-02-05 23:11 [PATCH 0/9] add --ff option to cherry-pick Christian Couder
2010-02-05 23:11 ` [PATCH 1/9] revert: libify cherry-pick and revert functionnality Christian Couder
2010-02-05 23:11 ` [PATCH 2/9] reset: refactor updating heads into a static function Christian Couder
2010-02-05 23:11 ` [PATCH 3/9] reset: refactor reseting in its own function Christian Couder
2010-02-05 23:11 ` [PATCH 4/9] reset: make reset function non static and declare it in "reset.h" Christian Couder
2010-02-05 23:11 ` [PATCH 5/9] revert: add --ff option to allow fast forward when cherry-picking Christian Couder
2010-02-05 23:57 ` Junio C Hamano
2010-02-06 0:21 ` Junio C Hamano
2010-02-28 22:22 ` Christian Couder
2010-02-06 9:40 ` Paolo Bonzini
2010-02-06 15:29 ` Christian Couder
2010-02-06 15:41 ` Paolo Bonzini [this message]
2010-02-05 23:11 ` [PATCH 6/9] cherry-pick: add tests for new --ff option Christian Couder
2010-02-05 23:11 ` [PATCH 7/9] Documentation: describe new cherry-pick " Christian Couder
2010-02-05 23:11 ` [PATCH 8/9] rebase -i: use new --ff cherry-pick option Christian Couder
2010-02-05 23:11 ` [PATCH 9/9] merge: use new "reset" function instead of running "git read-tree" Christian Couder
2010-02-06 0:03 ` Junio C Hamano
2010-02-06 15:34 ` Christian Couder
2010-02-05 23:45 ` [PATCH 0/9] add --ff option to cherry-pick Junio C Hamano
2010-02-06 15:27 ` Christian Couder
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='hkk2jl$ghl$1@ger.gmane.org' \
--to=bonzini@gnu.org \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.