rebase -m: fix serialization of strategy options