Jonathan Tan <jonathantanmy@xxxxxxxxxx> writes:
> @@ -1840,6 +1844,9 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
> "interactive or merge options"));
> }
>
> + if (options.skip_cherry_pick_detection && !is_interactive(&options))
> + die(_("--skip-cherry-pick-detection does not work with the 'apply' backend"));
> +
I presume this is, as before, built directly on v2.25.0; thanks for
keeping the original base while iterating.
Just a note to myself and those who are experimenting with the
patch. When merged to the more recent codebase, is_interactive()
here will have to become is_merge().
