From: Paolo Bonzini <bonzini@gnu.org>
To: Junio C Hamano <gitster@pobox.com>
Cc: Greg Price <price@ksplice.com>, git@vger.kernel.org
Subject: Re: merge ignores --no-commit in fast-forward case
Date: Sun, 20 Sep 2009 16:04:40 +0200 [thread overview]
Message-ID: <4AB63678.6010500@gnu.org> (raw)
In-Reply-To: <7viqff97l4.fsf@alter.siamese.dyndns.org>
On 09/19/2009 01:05 AM, Junio C Hamano wrote:
> If "surprising" is the problem (and it certainly is), perhaps it would be
> better to rewrite it not to be so surprising, like:
>
> --no-commit::
> Do not create a new commit.
Do not create a new _merge_ commit, and it's perfect.
Paolo
next prev parent reply other threads:[~2009-09-20 14:04 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-09-13 6:40 merge ignores --no-commit in fast-forward case Tomas Carnecky
2009-09-13 7:30 ` Junio C Hamano
2009-09-18 19:47 ` Greg Price
2009-09-18 23:05 ` Junio C Hamano
2009-09-20 14:04 ` Paolo Bonzini [this message]
2009-09-19 8:09 ` Björn Steinbrink
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=4AB63678.6010500@gnu.org \
--to=bonzini@gnu.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=price@ksplice.com \
/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).