Git/squash

Notes

Squashing seems to involve something like this:

# Create new branch from master
$ git checkout -b squash-feature

# squash the commits from feature into your squash branch
$ git read-tree -m -u <feature>

...where squash-feature is just a conventional name for the branch in which you are doing the squashing, and <feature> is the name of the branch you're squashing [from].