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

Re: multiple-commit cherry-pick?

From
MRMichael Radziej <mir@noris.de>
Date
Nov 7, 2008, 10:46 UTC
Message-ID
<20081107104630.GB12424@noris.de>
In-Reply-To
<7vskq4gmf5.fsf@gitster.siamese.dyndns.org>
On Thu, Nov 06, Junio C Hamano wrote:
> Or "git show --pretty=email $commit1 $commit2" ... piped to "am"?
Or make git show write shell commands.

I often have commits that later need to be cherry-picked into other branches. For these, I use a commit message that starts with the name of the branch, like "implement-foo: make foo barfy". Later when I want to do the cherry-picking, I use this:

git log t/whatever..master --reverse --pretty=tformat:'git cherry-pick %h # %s' | sed 's/^\([^:]*\) \([^:]*\):/git checkout \2 \&\& \1/'

giving me output like:

git checkout implement-foo && git cherry-pick 90ce727 # make foo barfy git checkout ...

... and I'm ready for cut'n'paste.
Michael
-- 
noris network AG - Deutschherrnstraße 15-19 - D-90429 Nürnberg -
Tel +49-911-9352-0 - Fax +49-911-9352-100
http://www.noris.de - The IT-Outsourcing Company
 
Vorstand: Ingo Kraupa (Vorsitzender), Joachim Astel, Hansjochen Klenk - 
Vorsitzender des Aufsichtsrats: Stefan Schnabel - AG Nürnberg HRB 17689
Previous: Johannes Schindelin
Message 31 of 31 in “multiple-commit cherry-pick?”
  1. Miles BaderNov 6, 2008
  2. Deskin MillerNov 6, 2008
  3. Björn SteinbrinkNov 6, 2008
  4. Miles BaderNov 6, 2008
  5. Björn SteinbrinkNov 6, 2008
  6. Miles BaderNov 7, 2008
  7. Björn SteinbrinkNov 7, 2008
  8. Miles BaderNov 7, 2008
  9. Alex RiesenNov 6, 2008
  10. Linus TorvaldsNov 7, 2008
  11. Miles BaderNov 7, 2008
  12. Alex RiesenNov 7, 2008
  13. Junio C HamanoNov 7, 2008
  14. Alex RiesenNov 7, 2008
  15. Linus TorvaldsNov 7, 2008
  16. Alex RiesenNov 9, 2008
  17. Johannes SchindelinNov 10, 2008
  18. Alex RiesenNov 10, 2008
  19. Johannes SchindelinNov 10, 2008
  20. Chris FreyNov 14, 2008
  21. Johannes SchindelinNov 14, 2008
  22. Linus TorvaldsNov 14, 2008
  23. Johannes SchindelinNov 14, 2008
  24. Junio C HamanoNov 14, 2008
  25. Linus TorvaldsNov 14, 2008
  26. Linus TorvaldsNov 14, 2008
  27. Pierre HabouzitNov 16, 2008
  28. Francis GaliegueNov 14, 2008
  29. Junio C HamanoNov 10, 2008
  30. Johannes SchindelinNov 10, 2008
  31. Michael RadziejNov 7, 2008

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.