From: Paolo Bonzini <bonzini@gnu.org>
To: Junio C Hamano <gitster@pobox.com>
Cc: Christian Couder <chriscool@tuxfamily.org>,
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 v4 3/7] revert: add --ff option to allow fast forward when cherry-picking
Date: Sun, 07 Mar 2010 09:34:08 +0100 [thread overview]
Message-ID: <4B936500.9020005@gnu.org> (raw)
In-Reply-To: <7v6358dbv8.fsf@alter.siamese.dyndns.org>
On 03/07/2010 04:55 AM, Junio C Hamano wrote:
> What was the real motive/use case of "cherry-pick --ff"?
Avoiding pointless separation of histories. It's true that nowadays
git-patch-id will make a good job of reconciling them, but they do look
ugly in gitk.
Paolo
next prev parent reply other threads:[~2010-03-07 8:34 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-03-06 20:34 [PATCH v4 0/7] add --ff option to cherry-pick Christian Couder
2010-03-06 20:34 ` [PATCH v4 1/7] parse-options: add parse_options_concat() to concat options Christian Couder
2010-03-06 20:34 ` [PATCH v4 2/7] builtin/merge: make checkout_fast_forward() non static Christian Couder
2010-03-06 20:34 ` [PATCH v4 3/7] revert: add --ff option to allow fast forward when cherry-picking Christian Couder
2010-03-07 3:55 ` Junio C Hamano
2010-03-07 8:34 ` Paolo Bonzini [this message]
2010-03-07 9:05 ` Junio C Hamano
2010-03-07 20:39 ` Christian Couder
2010-03-06 20:34 ` [PATCH v4 4/7] cherry-pick: add tests for new --ff option Christian Couder
2010-03-06 20:34 ` [PATCH v4 5/7] Documentation: describe new cherry-pick " Christian Couder
2010-03-06 20:34 ` [PATCH v4 6/7] cherry-pick: add a no-op --no-ff option to future proof scripts Christian Couder
2010-03-06 20:34 ` [PATCH v4 7/7] rebase -i: use new --ff cherry-pick option 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=4B936500.9020005@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=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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).