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

Re: [PATCH 1/2] Introduce CHERRY_PICK_HEAD

From
Nguyen Thai Ngoc Duy <pclouds@gmail.com>
Date
Feb 16, 2011, 11:13 UTC
Message-ID
<AANLkTim8m4uBjn_FJ-SWnARkv8rTiM1SrBTBFeg2R_hd@mail.gmail.com>
In-Reply-To
<1297850903-65038-2-git-send-email-jaysoffian@gmail.com>
On Wed, Feb 16, 2011 at 5:08 PM, Jay Soffian <jaysoffian@gmail.com> wrote:
Show 8 quoted lines
> When a cherry-pick conflicts git advises to use:
>
>  $ git commit -c <original commit id>
>
> to preserve the original commit message and authorship. Instead, let's
> record the original commit id in CHERRY_PICK_HEAD and advise to use:
>
>  $ git commit -c CHERRY_PICK_HEAD

Wouldn't it be more convenient to do "git cherry-pick --continue" instead of "git commit -c CHERRY_PICK_HEAD"?

-- 
Duy
Previous: Jay SoffianNext: Jay Soffian
Message 3 of 18 in “CHERRY_PICK_HEAD”
  1. 0/2 CHERRY_PICK_HEADJay Soffian, Feb 16, 2011
  2. 1/2 Introduce CHERRY_PICK_HEADJay Soffian, Feb 16, 2011
  3. Nguyen Thai Ngoc DuyFeb 16, 2011
  4. Jay SoffianFeb 16, 2011
  5. Introduce CHERRY_PICK_HEADJay Soffian, Feb 16, 2011
  6. Jay SoffianFeb 16, 2011
  7. Jonathan NiederFeb 16, 2011
  8. Jay SoffianFeb 16, 2011
  9. Jonathan NiederFeb 16, 2011
  10. Junio C HamanoFeb 17, 2011
  11. Jonathan NiederFeb 17, 2011
  12. 2/2 Teach commit about CHERRY_PICK_HEADJay Soffian, Feb 16, 2011
  13. Junio C HamanoFeb 16, 2011
  14. Jay SoffianFeb 16, 2011
  15. 5/2 bash: teach __git_ps1 about CHERRY_PICK_HEADJonathan Nieder, Feb 16, 2011
  16. Junio C HamanoFeb 16, 2011
  17. Jonathan NiederFeb 16, 2011
  18. Jay SoffianFeb 17, 2011

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.