git-wip: Add -s option for git merge --squash

53af72ce-446e-11e4-96dd-c80aa9e67bbd