Options for revert
For merge commits, the "mainline" is treated as the parent.
Options for the merging
Options for the checkout