Add support for the -r (--rebase) option, before doing the actual merge.
1 file changed