From: Johannes Schindelin Date: Fri, 23 Jun 2006 12:36:11 GMT Subject: Re: [PATCH] git-merge --squash Message-ID: In-Reply-To: <20060623122501.GD15631@cip.informatik.uni-erlangen.de> Hi, On Fri, 23 Jun 2006, Thomas Glanzmann wrote: > Hello Junio, > > > So in that sense I would imagine --squash is not really useless > > in such a situation as I made it sound like, but at the same > > time I suspect people might be better off to use tools like > > StGIT which are specially designed to support such a workflow if > > they were to do this. > > thanks for --squash. So --squash is basically a 'suck multiple deltas > from another branch into ., but don't commit it'. I very often use that > way of work flow. I do small and many commits, and when I am done I > merge them to one a bit bigger one and submit it upstream. I useally use > 'one branch per feature'. Isn't this the same as 'git-cherry-pick -n'? I often do a poor man's StGIT by cherry picking my way through a messy branch, often combining patches by '-n'. Ciao, Dscho