rebase -m: cleanup --strategy-option handling