Don't do squash commits, just rebase -i your branch before merging so you only have one commit. It's pretty trivial to do.