Re: [PATCH] git-merge --squash

Johannes Schindelin [off-list ref] writes:

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

Operationally, it probably is equivalent to the repeated use of
'cherry-pick -n' for all commits on a topic, but that would risk
you having to resolve conflicts unnecessarily when you are
shooting for as the result is a single commit, because you would
have to do N merges with that workflow.  Squashing is about
merging the tip of the topic into mainline, so the conflict
resolution needs to be done only once.