Re: [PATCH v2] rebase --merge: optionally skip upstreamed commits

From: Junio C Hamano <gitster@pobox.com>
Date: Mar 18, 2020, 20:20 UTC
Message-ID: <xmqq8sjxfm99.fsf@gitster.c.googlers.com>
In-Reply-To: <20200318173051.25875-1-jonathantanmy@google.com>

Jonathan Tan <jonathantanmy@google.com> writes:

Show 7 quoted lines

> @@ -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().