From: Jonathan Tan <jonathantanmy@google.com>
To: gitgitgadget@gmail.com
Cc: git@vger.kernel.org, jonathantanmy@google.com,
phillip.wood123@gmail.com, Johannes.Schindelin@gmx.de,
bturner@atlassian.com, sami@boukortt.com, newren@gmail.com
Subject: Re: [PATCH v3 4/4] rebase --merge: optionally skip upstreamed commits
Date: Sat, 11 Apr 2020 11:12:58 -0700 [thread overview]
Message-ID: <20200411181258.5907-1-jonathantanmy@google.com> (raw)
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.
next prev parent reply other threads:[~2020-04-11 18:13 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-09 23:26 [PATCH] rebase -i: mark commits that begin empty in todo editor Elijah Newren via GitGitGadget
2020-04-10 0:50 ` Junio C Hamano
2020-04-10 2:06 ` Bryan Turner
2020-04-10 4:57 ` Junio C Hamano
2020-04-10 17:51 ` [PATCH v2 0/3] " Elijah Newren via GitGitGadget
2020-04-10 17:51 ` [PATCH v2 1/3] " Elijah Newren via GitGitGadget
2020-04-10 17:51 ` [PATCH v2 2/3] rebase: reinstate --no-keep-empty Elijah Newren via GitGitGadget
2020-04-10 20:37 ` Junio C Hamano
2020-04-10 21:41 ` Elijah Newren
2020-04-10 17:51 ` [PATCH v2 3/3] rebase: fix an incompatible-options error message Elijah Newren via GitGitGadget
2020-04-10 20:42 ` [PATCH v2 0/3] rebase -i: mark commits that begin empty in todo editor Junio C Hamano
2020-04-10 21:04 ` Junio C Hamano
2020-04-10 21:14 ` Junio C Hamano
2020-04-10 22:11 ` Elijah Newren
2020-04-10 21:29 ` Junio C Hamano
2020-04-10 22:13 ` Elijah Newren
2020-04-10 22:30 ` Junio C Hamano
2020-04-11 0:07 ` Elijah Newren
2020-04-11 21:14 ` Junio C Hamano
2020-04-11 2:44 ` [PATCH v3 0/4] " Elijah Newren via GitGitGadget
2020-04-11 2:44 ` [PATCH v3 1/4] " Elijah Newren via GitGitGadget
2020-04-15 20:52 ` Junio C Hamano
2020-04-11 2:44 ` [PATCH v3 2/4] rebase: reinstate --no-keep-empty Elijah Newren via GitGitGadget
2020-04-11 2:44 ` [PATCH v3 3/4] rebase: fix an incompatible-options error message Elijah Newren via GitGitGadget
2020-04-11 2:44 ` [PATCH v3 4/4] rebase --merge: optionally skip upstreamed commits Jonathan Tan via GitGitGadget
2020-04-11 18:12 ` Jonathan Tan [this message]
2020-04-14 9:11 ` [PATCH v3 0/4] rebase -i: mark commits that begin empty in todo editor Phillip Wood
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200411181258.5907-1-jonathantanmy@google.com \
--to=jonathantanmy@google.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=bturner@atlassian.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=newren@gmail.com \
--cc=phillip.wood123@gmail.com \
--cc=sami@boukortt.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).