Update git squashing to include a note about fixup

[lisa]

This may be preferable to squash, especially when the commit messages are to be discarded in favour of the picked commit(s).