From: Paolo Bonzini <bonzini@gnu.org>
To: Johannes Sixt <j.sixt@viscovery.net>
Cc: Christian Couder <chriscool@tuxfamily.org>,
Junio C Hamano <gitster@pobox.com>,
git@vger.kernel.org,
Linus Torvalds <torvalds@linux-foundation.org>,
Johannes Schindelin <Johannes.Schindelin@gmx.de>,
Stephan Beyer <s-beyer@gmx.net>,
Daniel Barkalow <barkalow@iabervon.org>,
Stephen Boyd <bebarino@gmail.com>
Subject: Re: [PATCH v2 00/12] add --ff option to cherry-pick
Date: Mon, 01 Mar 2010 13:34:46 +0100 [thread overview]
Message-ID: <4B8BB466.1000909@gnu.org> (raw)
In-Reply-To: <4B8B78BB.8050008@viscovery.net>
On 03/01/2010 09:20 AM, Johannes Sixt wrote:
> Christian Couder schrieb:
>> The goal of this patch series is to make it possible for "git cherry-pick"
>> to fast forward instead of creating a new commit if the cherry picked commit
>> has the same parent as the one we are cherry-picking on.
>
> Why don't you just divert to 'git merge --ff' in this case?
Because the purpose of the series is exactly to replace
if A^ == HEAD; then
git merge --ff A # or git reset --hard A
else
git cherry-pick A
fi
with a single "git cherry-pick --ff A".
An alternative would be the old ff-strategy series which would allow
something like
git merge --ff=only A || git cherry-pick A
Paolo
prev parent reply other threads:[~2010-03-01 12:35 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-02-28 22:21 [PATCH v2 00/12] add --ff option to cherry-pick Christian Couder
2010-02-28 22:21 ` [PATCH v2 01/12] revert: libify cherry-pick and revert functionnality Christian Couder
2010-02-28 22:21 ` [PATCH v2 02/12] pick: refactor checking parent in a check_parent function Christian Couder
2010-02-28 22:21 ` [PATCH v2 03/12] pick: make check_parent function extern Christian Couder
2010-02-28 22:21 ` [PATCH v2 04/12] pick: move calling check_parent() ouside pick_commit() Christian Couder
2010-02-28 22:22 ` [PATCH v2 05/12] reset: refactor updating heads into a static function Christian Couder
2010-02-28 22:22 ` [PATCH v2 06/12] reset: refactor reseting in its own function Christian Couder
2010-02-28 22:22 ` [PATCH v2 07/12] reset: make reset function non static and declare it in "reset.h" Christian Couder
2010-02-28 22:22 ` [PATCH v2 08/12] revert: add --ff option to allow fast forward when cherry-picking Christian Couder
2010-02-28 22:22 ` [PATCH v2 09/12] cherry-pick: add tests for new --ff option Christian Couder
2010-02-28 22:22 ` [PATCH v2 10/12] Documentation: describe new cherry-pick " Christian Couder
2010-02-28 22:22 ` [PATCH v2 11/12] cherry-pick: add a no-op --no-ff option to future proof scripts Christian Couder
2010-02-28 22:22 ` [PATCH v2 12/12] rebase -i: use new --ff cherry-pick option Christian Couder
2010-03-01 3:49 ` [PATCH v2 00/12] add --ff option to cherry-pick Junio C Hamano
2010-03-01 4:42 ` Daniel Barkalow
2010-03-01 7:00 ` Christian Couder
2010-03-01 8:48 ` Junio C Hamano
2010-03-04 2:06 ` Christian Couder
2010-03-04 3:31 ` Junio C Hamano
2010-03-04 6:55 ` Christian Couder
2010-03-04 20:48 ` Junio C Hamano
2010-03-21 2:01 ` [PATCH 3/6] revert: add --ff option to allow fast forward when cherry-picking Jonathan Nieder
2010-03-01 8:20 ` [PATCH v2 00/12] add --ff option to cherry-pick Johannes Sixt
2010-03-01 12:34 ` Paolo Bonzini [this message]
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=4B8BB466.1000909@gnu.org \
--to=bonzini@gnu.org \
--cc=Johannes.Schindelin@gmx.de \
--cc=barkalow@iabervon.org \
--cc=bebarino@gmail.com \
--cc=chriscool@tuxfamily.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=j.sixt@viscovery.net \
--cc=s-beyer@gmx.net \
--cc=torvalds@linux-foundation.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.