Adding squash options and rebase default options, plus a couple of aliases for log