On Friday 13 June 2008 16:50:10 Miklos Vajna wrote: > On Fri, Jun 13, 2008 at 04:33:34PM +0200, Mirko Stocker <mirko.stocker@xxxxxx> wrote: > > What I don't like is how we have to make the upstream patch(es). Is > > there an easy way we can get multiple patches, lets say for each > > commit we made? Or is it easier to make a lots of branches and to > > then create a patch from the diff between the branch and origin/origin? > > Don't you mean origin/master? Hm, I'm not sure.. if I work on an a feature in a branch, and now I want to create a patch that applies to the CVS head, then I have to make the diff to origin/origin, right? > In general, if you don't merge your changes but you rebase on top of the > new upstream head, then you can use 'git format-patch origin/master..' > to create patches for each commit. Ah, I didn't know about git-rebase, thanks! That's exactly what I wanted :) I think I've already fallen in love with git. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
