RE: Merging commits together into a super-commit

From: Alex Bennee <kernel-hacker@bennee.com>
Date: May 10, 2007, 11:32 UTC
Message-ID: <1178796748.5806.102.camel@murta.transitives.com>
In-Reply-To: <000e01c792f5$0861abd0$0b0aa8c0@abf.local>

On Thu, 2007-05-10 at 13:19 +0200, Raimund Bauer wrote:

Show 15 quoted lines

> > 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.