From: Christian Couder <christian.couder@gmail.com>
To: Paolo Bonzini <bonzini@gnu.org>
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>
Subject: Re: [RFC/PATCH 5/6] revert: add --ff option to allow fast forward when cherry-picking
Date: Mon, 1 Feb 2010 13:43:57 +0100 [thread overview]
Message-ID: <c07716ae1002010443p4e0443feke14e5f877584640f@mail.gmail.com> (raw)
In-Reply-To: <4B66B68C.7050505@gnu.org>
On Mon, Feb 1, 2010 at 12:10 PM, Paolo Bonzini <bonzini@gnu.org> wrote:
>> + OPT_BOOLEAN(0, "ff",&ff_ok, "allow fast forward"),
>
> Why should this not be the default?
Maybe it could be the default, but in this case it should be made
compatible with -n option
(and perhaps other options) for backward compatibility, and this would
probably need more
involved changes.
Thanks,
Christian.
> Instead, you'd add --no-ff. This would
> simplify 6/6 further, like
>
> eval sha1=\$$#
> ...
> output git cherry-pick "$@"
>
> Paolo
> --
> To unsubscribe from this list: send the line "unsubscribe git" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
next prev parent reply other threads:[~2010-02-01 12:44 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-02-01 7:55 [RFC/PATCH 0/6] add --ff option to cherry-pick Christian Couder
2010-02-01 7:55 ` [RFC/PATCH 1/6] revert: libify cherry-pick and revert functionnality Christian Couder
2010-02-01 10:26 ` Johannes Schindelin
2010-02-03 16:40 ` Stephen Boyd
2010-02-01 7:55 ` [RFC/PATCH 2/6] reset: refactor updating heads into a static function Christian Couder
2010-02-01 7:55 ` [RFC/PATCH 3/6] reset: refactor reseting in its own function Christian Couder
2010-02-01 7:55 ` [RFC/PATCH 4/6] reset: make reset function non static and declare it in "reset.h" Christian Couder
2010-02-01 7:55 ` [RFC/PATCH 5/6] revert: add --ff option to allow fast forward when cherry-picking Christian Couder
2010-02-01 11:10 ` Paolo Bonzini
2010-02-01 12:43 ` Christian Couder [this message]
2010-02-01 14:29 ` Paolo Bonzini
2010-02-02 5:13 ` Christian Couder
2010-02-02 7:56 ` Paolo Bonzini
2010-02-01 7:55 ` [RFC/PATCH 6/6] 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=c07716ae1002010443p4e0443feke14e5f877584640f@mail.gmail.com \
--to=christian.couder@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=barkalow@iabervon.org \
--cc=bonzini@gnu.org \
--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).