Yep. It will basically add all of your changes into the current branch
like you did a real merge, but it just does not commit the result. If
you 'git merge --squash', and then 'git status', you can see the
changed files are ready to be committed, and you can commit them with
one Big Commit.
The re
| also helps keep the history clean. An easy way to do this is:
|
| $ git checkout master
| $ git merge --squash type-nats-simple
Does that make One Patch with a single coherent message, abandoning all the
intermediate commit messages on type-nats-simple? I hope so.
Simon
_
