On Thu, 2007-05-10 at 13:19 +0200, Raimund Bauer wrote: > > Hi, > <snip> > You don't want to be > > correcting a whole bunch of merge failures for every commit > > in your current tree. > > > > So far the only was I can see to do this is a: > > > > git-diff master..HEAD > my.patch > > > > And then re-applying your patch in stages, manually doing the commits. > > > > Am I missing something? > > git merge --squash ? Hmm, that would do although it only works on whole trees, you can't specify a range of commits. So you would have to cherrypick groups of changes onto other branches and then merge them together with a couple of --squashes However thanks for pointing that one out :-) -- Alex, homepage: http://www.bennee.com/~alex/ A pretty woman can do anything; an ugly woman must do everything. - 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
