Thread (35 messages) flat view 35 messages, 14 authors, 2016-06-15

Re: Merging commits together into a super-commit

From: Linus Torvalds <torvalds@linux-foundation.org>
Date: 2016-06-15 22:43:09


On Thu, 10 May 2007, Johannes Sixt wrote:
- cherry-pick them before commit

  $ git cherry-pick -n x
  $ git cherry-pick -n y
  $ git cherry-pick -n z
I've done this (actually, mostly with "revert", but cherry-pick and revert 
are literally the same things).

However:
  $ git commit -m "$(for c in x y z; do git show --stat $c; done)" -e
I'm too lazy to do this part, so I always do it by hand.
You didn't really think that git couldn't do that, did you? ;)
Clearly git can, but equally clearly it really *would* be pretty nice if 
you could just do

	git cherry-pick x y z

and create one commit and have the message already somewhat done for you 
(and "git revert" doing the same).

So if somebody does that, I'll certainly applaud..

		Linus
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help