From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
To: "Shawn O. Pearce" <spearce@spearce.org>
Cc: Frank Lichtenheld <frank@lichtenheld.de>, git@vger.kernel.org
Subject: Re: [PATCH] git-cherry-pick: improve description of -x.
Date: Mon, 22 Oct 2007 07:19:08 +0200 [thread overview]
Message-ID: <20071022051908.GA16164@ins.uni-bonn.de> (raw)
In-Reply-To: <20071022051453.GM14735@spearce.org>
* Shawn O. Pearce wrote on Mon, Oct 22, 2007 at 07:14:53AM CEST:
>
> I think you are right that the current behavior of -x *not*
> including the prior commit SHA-1 in the case of a conflict is wrong.
> The problem however is that git-commit.sh doesn't get the data
> necessary to preseve the original author name/email/date/tz unless
> you use the "-c $id" option.
But the note added by -x is even missing when I add "-c $id" to
the git-commit command! That's the point I was trying to make,
and really the only thing that seemed weird to me.
Cheers,
Ralf
prev parent reply other threads:[~2007-10-22 5: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
2007-10-21 9:36 ` Ralf Wildenhues
2007-10-22 5:14 ` Shawn O. Pearce
2007-10-22 5:19 ` Ralf Wildenhues [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=20071022051908.GA16164@ins.uni-bonn.de \
--to=ralf.wildenhues@gmx.de \
--cc=frank@lichtenheld.de \
--cc=git@vger.kernel.org \
--cc=spearce@spearce.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).