Re: 2.6.19 -mm merge plans

From: Pierre Ossman
Date: Wed Oct 11 2006 - 10:10:23 EST


Linus Torvalds wrote:
>
> (Of course, once you get really used to git, you use git _anyway_, and
> then you use cherry-pick and other tools to re-write a cleaned-up version
> of the thing that you originally screwed up because you didn't know what
> you were doing. So you _can_ do this too with git, but that doesn't mean
> that git would necessarily be the best way to do it).
>
> That said, maybe we could help the "fixup" phases evenmore using git. For
> example, right now you can do "git cherry-pick" to transfer individual
> patches, but if you want to combine two commits while cherry-picking, it
> immediately gets more involved (still quite doable: use cherry-pick
> multiple times with the "-n" flag, but it's not as obvious any more).
>

Are there any docs (with examples) on how to work like this? I currently
use StGIT for my patch management, but that has some problems when it
comes to publishing my development tree for others.

Rgds
Pierre

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/