Added git merge --squash alias