From: "Shawn O. Pearce" <spearce@spearce.org>
To: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Cc: Frank Lichtenheld <frank@lichtenheld.de>, git@vger.kernel.org
Subject: Re: [PATCH] git-cherry-pick: improve description of -x.
Date: Fri, 19 Oct 2007 23:19:17 -0400 [thread overview]
Message-ID: <20071020031917.GR14735@spearce.org> (raw)
In-Reply-To: <20071019211152.GN3917@planck.djpig.de>
Frank Lichtenheld <frank@lichtenheld.de> wrote:
> On Fri, Oct 19, 2007 at 07:41:34PM +0200, Ralf Wildenhues wrote:
> > Further, I am surprised that -x seems to be nonfunctional when the
> > cherry pick introduces a conflict. Example:
> [...]
> > The prototype commit message now does not contain the
> > | (cherry picked from commit ...).
> >
> > Is that by design (because there were conflicts) or an omission?
> > In case of the former, maybe the description of -x should mention this.
>
> git commit currently doesn't know that you commit a cherry-pick. The -c
> only says to use the commit message of the original commit. So this is
> currently by design.
Ralf, can you submit an updated version of this patch that describes
the current behavior better, given the "by design" remark above
from Frank?
--
Shawn.
next prev parent reply other threads:[~2007-10-20 3:19 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-10-19 17:41 [PATCH] git-cherry-pick: improve description of -x Ralf Wildenhues
2007-10-19 21:11 ` Frank Lichtenheld
2007-10-20 3:19 ` Shawn O. Pearce [this message]
2007-10-21 9:36 ` Ralf Wildenhues
2007-10-22 5:14 ` Shawn O. Pearce
2007-10-22 5:19 ` Ralf Wildenhues
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=20071020031917.GR14735@spearce.org \
--to=spearce@spearce.org \
--cc=Ralf.Wildenhues@gmx.de \
--cc=frank@lichtenheld.de \
--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 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).