Re: [PATCH] git-merge --squash

From: Thomas Glanzmann <sithglan@stud.uni-erlangen.de>
Date: Jun 23, 2006, 12:25 UTC
Message-ID: <20060623122501.GD15631@cip.informatik.uni-erlangen.de>
In-Reply-To: <7vd5d09pe2.fsf@assigned-by-dhcp.cox.net>

Hello Junio,

Show 5 quoted lines

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

        Thomas