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

Re: [PATCH] cherry-pick -x: add newline before pick note

From
Jonathan Nieder <jrnieder@gmail.com>
Date
Mar 8, 2011, 22:34 UTC
Message-ID
<20110308223448.GF26471@elie>
In-Reply-To
<20110308221855.GA4030@ugly.local>
Hi again.
Oswald Buddenhagen wrote:
> i posted via the gmane webform ...

(See <http://thread.gmane.org/gmane.comp.version-control.git/154490>. It's obnoxious that there is not an easier way, I agree.)

> i did a much simpler patch in that vein as well, but scrapped it again -
> totally overengineered. the idea is to optimize the simple case -
> cherry-pick -x, push. everything else needs amends anyway.

It's been a vague wish of mine for a while to fix "cherry-pick -x -s". I currently use it without amends and tolerate the blank line between the "cherry picked" and the sign-off.

Maybe you can convince people that wanting no extra blank line between an existing sign-off and the "cherry picked from" line is overengineering and worth regressing. I am not a fanatic about it --- I just thought it was worth mentioning that this proposed change would not be seen as positive by everyone.

Put another way, I don't find the two words "totally overengineered" very convincing here. For what it's worth.

Cheers, Jonathan

Previous: Oswald Buddenhagen
Message 13 of 13 in “cherry-pick -x: add newline before pick note”
  1. cherry-pick -x: add newline before pick noteMichael J Gruber, Nov 16, 2010
  2. Jeff KingNov 16, 2010
  3. commit -s: allow "(cherry picked " lines in sign-off sectionJonathan Nieder, Nov 16, 2010
  4. Jonathan NiederNov 16, 2010
  5. Junio C HamanoNov 16, 2010
  6. Jonathan NiederNov 16, 2010
  7. Junio C HamanoNov 17, 2010
  8. Jay SoffianNov 17, 2010
  9. Jay SoffianNov 17, 2010
  10. Oswald BuddenhagenMar 8, 2011
  11. Jonathan NiederMar 8, 2011
  12. Oswald BuddenhagenMar 8, 2011
  13. Jonathan NiederMar 8, 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.