From: Jonathan Tan <jonathantanmy@google.com>
Date: Sat, 11 Apr 2020 18:12:58 GMT
Subject: Re: [PATCH v3 4/4] rebase --merge: optionally skip upstreamed commits
Message-ID: <20200411181258.5907-1-jonathantanmy@google.com>
In-Reply-To: <20d3a50f5a4bf91223c1b849d91e790683d70d66.1586573068.git.gitgitgadget@gmail.com>

> @@ -601,6 +620,7 @@ are incompatible with the following options:
>   * --exec
>   * --no-keep-empty
>   * --empty=
> + * --reapply-cherry-picks
>   * --edit-todo
>   * --root when used in combination with --onto

[snip]

> @@ -1825,6 +1829,9 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
>  	if (options.empty != EMPTY_UNSPECIFIED)
>  		imply_merge(&options, "--empty");
>  
> +	if (options.reapply_cherry_picks)
> +		imply_merge(&options, "--reapply-cherry-picks");
> +
>  	if (gpg_sign) {
>  		free(options.gpg_sign_opt);
>  		options.gpg_sign_opt = xstrfmt("-S%s", gpg_sign);

Thanks - these definitely look cleaner than what I had, and the rest of
the patch looks good too.