Re: multiple-commit cherry-pick?

!MAILaRCHIVE_VOTE_RePLACE
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
To: Junio C Hamano <gitster@...>
Cc: Linus Torvalds <torvalds@...>, Alex Riesen <raa.lkml@...>, Miles Bader <miles@...>, <git@...>
Date: Friday, November 7, 2008 - 6:46 am

On Thu, Nov 06, Junio C Hamano wrote:

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
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
multiple-commit cherry-pick?, Miles Bader, (Wed Nov 5, 10:45 pm)
Re: multiple-commit cherry-pick?, Alex Riesen, (Thu Nov 6, 5:37 pm)
Re: multiple-commit cherry-pick?, Linus Torvalds, (Thu Nov 6, 11:29 pm)
Re: multiple-commit cherry-pick?, Junio C Hamano, (Fri Nov 7, 1:00 am)
Re: multiple-commit cherry-pick?, Michael Radziej, (Fri Nov 7, 6:46 am)
Re: multiple-commit cherry-pick?, Alex Riesen, (Fri Nov 7, 3:12 am)
Re: multiple-commit cherry-pick?, Linus Torvalds, (Fri Nov 7, 2:08 pm)
Re: multiple-commit cherry-pick?, Alex Riesen, (Sun Nov 9, 6:25 am)
Re: multiple-commit cherry-pick?, Johannes Schindelin, (Mon Nov 10, 3:58 pm)
Re: multiple-commit cherry-pick?, Junio C Hamano, (Mon Nov 10, 4:41 pm)
Re: multiple-commit cherry-pick?, Johannes Schindelin, (Mon Nov 10, 5:34 pm)
Re: multiple-commit cherry-pick?, Alex Riesen, (Mon Nov 10, 4:24 pm)
Re: multiple-commit cherry-pick?, Johannes Schindelin, (Mon Nov 10, 5:31 pm)
Re: multiple-commit cherry-pick?, Chris Frey, (Fri Nov 14, 1:08 am)
Re: multiple-commit cherry-pick?, Linus Torvalds, (Fri Nov 14, 12:11 pm)
Re: multiple-commit cherry-pick?, Francis Galiegue, (Fri Nov 14, 2:38 pm)
Re: multiple-commit cherry-pick?, Junio C Hamano, (Fri Nov 14, 1:29 pm)
Re: multiple-commit cherry-pick?, Linus Torvalds, (Fri Nov 14, 1:41 pm)
Re: multiple-commit cherry-pick?, Linus Torvalds, (Fri Nov 14, 1:55 pm)
Re: multiple-commit cherry-pick?, Pierre Habouzit, (Sun Nov 16, 5:11 am)
Re: multiple-commit cherry-pick?, Johannes Schindelin, (Fri Nov 14, 12:59 pm)
Re: multiple-commit cherry-pick?, Johannes Schindelin, (Fri Nov 14, 10:00 am)
Re: multiple-commit cherry-pick?, Miles Bader, (Fri Nov 7, 12:38 am)
Re: multiple-commit cherry-pick?, Alex Riesen, (Fri Nov 7, 3:13 am)
Re: multiple-commit cherry-pick?, Deskin Miller, (Wed Nov 5, 11:24 pm)
Re: multiple-commit cherry-pick?, Björn, (Thu Nov 6, 5:51 am)
Re: multiple-commit cherry-pick?, Miles Bader, (Thu Nov 6, 8:14 am)
Re: multiple-commit cherry-pick?, Björn, (Thu Nov 6, 8:26 am)
Re: multiple-commit cherry-pick?, Miles Bader, (Fri Nov 7, 1:09 am)
Re: multiple-commit cherry-pick?, Björn, (Fri Nov 7, 7:03 am)
Re: multiple-commit cherry-pick?, Miles Bader, (Fri Nov 7, 7:46 am)