title: What is the difference between merge --squash and rebase?
body: <p>I'm new to git and I'm trying to understand the difference between a squash and a rebase.  As I understand it you perform a squash when doing a rebase.</p>