git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH] git-cherry-pick: improve description of -x.

From
RWRalf Wildenhues <ralf.wildenhues@gmx.de>
Date
Oct 22, 2007, 05:19 UTC
Message-ID
<20071022051908.GA16164@ins.uni-bonn.de>
In-Reply-To
<20071022051453.GM14735@spearce.org>
* Shawn O. Pearce wrote on Mon, Oct 22, 2007 at 07:14:53AM CEST:
Show 6 quoted lines
> 
> 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

Previous: Shawn O. Pearce
Message 6 of 6 in “git-cherry-pick: improve description of -x.”
  1. git-cherry-pick: improve description of -x.Ralf Wildenhues, Oct 19, 2007
  2. Frank LichtenheldOct 19, 2007
  3. Shawn O. PearceOct 20, 2007
  4. Ralf WildenhuesOct 21, 2007
  5. Shawn O. PearceOct 22, 2007
  6. Ralf WildenhuesOct 22, 2007

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.