From: Raimund Bauer <ray@softwarelandschaft.com>
Date: Thu, 10 May 2007 11:19:08 GMT
Subject: RE: Merging commits together into a super-commit
Message-ID: <000e01c792f5$0861abd0$0b0aa8c0@abf.local>
In-Reply-To: <1178794261.5806.98.camel@murta.transitives.com>

> Hi,
> 
> I really love the fact I can micro-commit changes when I'm 
> developing. However at some point the combination of changes 
> I have made can be considered a single body of work. This is 
> especially true when you start doing things like re-basing on 
> code that has moved around a lot. 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 ?

-- 
best regards

  Ray