RE: Merging commits together into a super-commit

Hi,

On Thu, 10 May 2007, Alex Bennee wrote:

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

quoted

quoted

Hi,

 <snip> 
You don't want to be 

quoted

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

Since specifying several commit ranges can always lead to merge conflicts, 
it makes no sense to _not_ accumulate the patches in a separate branch.

Ciao,
Dscho