git-merge: add support for --commit and --no-squash