From: Elijah Newren <newren@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: "Elijah Newren via GitGitGadget" <gitgitgadget@gmail.com>,
git@vger.kernel.org, "Derrick Stolee" <derrickstolee@github.com>,
"Eric Sunshine" <sunshine@sunshineco.com>,
"Martin Ågren" <martin.agren@gmail.com>,
"Phillip Wood" <phillip.wood123@gmail.com>
Subject: Re: [PATCH v5 00/10] rebase: fix several code/testing/documentation issues around flag incompatibilities
Date: Wed, 25 Jan 2023 08:48:39 -0800 [thread overview]
Message-ID: <CABPp-BEWC_GQXLKvokLVgd4-Hq16MoZggyp6r-sj29SYyLippQ@mail.gmail.com> (raw)
In-Reply-To: <xmqqa626fu0x.fsf@gitster.g>
On Wed, Jan 25, 2023 at 8:39 AM Junio C Hamano <gitster@pobox.com> wrote:
>
> "Elijah Newren via GitGitGadget" <gitgitgadget@gmail.com> writes:
>
> > Changes since v4:
> >
> > * Pulled out the changes regarding incompatibility detection for
> > --[no-]reapply-cherry-picks into a separate patch. Phillip helped a lot
> > with understanding the behavior, suggesting changes, and getting the
> > wording right, and I think it deserves its own patch with its own
> > explanation.
>
> Hmph, does this replace the previous round that has already been in
> 'next' for two days? I do not mind reverting the merge and requeuing
> it, but just wanted ot make sure before doing anything.
Sorry, I didn't realize it had merged to next. With Phillip's ongoing
reviews and requests for changes, which you had even commented on
(https://lore.kernel.org/git/xmqqpmb4j8e9.fsf@gitster.g/ and the
thread that was in the middle of), I assumed it was still only in
seen.
But yes, if you could revert from next and replace, that would be
great. Now that v5 has Phillip's blessing (and multiple of his
corrections), I think it's good to merge down.
next prev parent reply other threads:[~2023-01-25 16:49 UTC|newest]
Thread overview: 70+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-19 5:36 [PATCH] rebase: mark --update-refs as requiring the merge backend Elijah Newren via GitGitGadget
2023-01-19 21:47 ` Derrick Stolee
2023-01-20 1:54 ` Elijah Newren
2023-01-20 15:27 ` Junio C Hamano
2023-01-20 16:47 ` Elijah Newren
2023-01-20 4:56 ` [PATCH v2 0/2] " Elijah Newren via GitGitGadget
2023-01-20 4:56 ` [PATCH v2 1/2] rebase: remove completely useless -C option Elijah Newren via GitGitGadget
2023-01-20 5:40 ` Eric Sunshine
2023-01-20 6:42 ` Elijah Newren
2023-01-20 9:55 ` Martin Ågren
2023-01-20 15:32 ` Elijah Newren
2023-01-20 12:05 ` Junio C Hamano
2023-01-20 15:31 ` Elijah Newren
2023-01-20 16:15 ` Junio C Hamano
2023-01-21 4:52 ` Elijah Newren
2023-01-22 0:02 ` Junio C Hamano
2023-01-20 4:56 ` [PATCH v2 2/2] rebase: mark --update-refs as requiring the merge backend Elijah Newren via GitGitGadget
2023-01-20 16:46 ` Phillip Wood
2023-01-21 1:34 ` Elijah Newren
2023-01-21 1:55 ` [PATCH v3 0/7] rebase: fix several code/testing/documentation issues around flag incompatibilities Elijah Newren via GitGitGadget
2023-01-21 1:55 ` [PATCH v3 1/7] rebase: mark --update-refs as requiring the merge backend Elijah Newren via GitGitGadget
2023-01-21 1:55 ` [PATCH v3 2/7] rebase: flag --apply and --merge as incompatible Elijah Newren via GitGitGadget
2023-01-21 1:55 ` [PATCH v3 3/7] rebase: remove --allow-empty-message from incompatible opts Elijah Newren via GitGitGadget
2023-01-21 15:09 ` Phillip Wood
2023-01-21 1:55 ` [PATCH v3 4/7] rebase: fix docs about incompatibilities with --root Elijah Newren via GitGitGadget
2023-01-21 1:55 ` [PATCH v3 5/7] rebase: add coverage of other incompatible options Elijah Newren via GitGitGadget
2023-01-21 15:20 ` Phillip Wood
2023-01-21 19:25 ` Phillip Wood
2023-01-22 5:11 ` Elijah Newren
2023-01-21 1:55 ` [PATCH v3 6/7] rebase: clarify the OPT_CMDMODE incompatibilities Elijah Newren via GitGitGadget
2023-01-21 1:55 ` [PATCH v3 7/7] rebase: fix formatting of rebase --reapply-cherry-picks option in docs Elijah Newren via GitGitGadget
2023-01-21 15:21 ` Phillip Wood
2023-01-22 6:12 ` [PATCH v4 0/9] rebase: fix several code/testing/documentation issues around flag incompatibilities Elijah Newren via GitGitGadget
2023-01-22 6:12 ` [PATCH v4 1/9] rebase: mark --update-refs as requiring the merge backend Elijah Newren via GitGitGadget
2023-01-22 6:12 ` [PATCH v4 2/9] rebase: flag --apply and --merge as incompatible Elijah Newren via GitGitGadget
2023-01-22 6:12 ` [PATCH v4 3/9] rebase: remove --allow-empty-message from incompatible opts Elijah Newren via GitGitGadget
2023-01-22 6:12 ` [PATCH v4 4/9] rebase: fix docs about incompatibilities with --root Elijah Newren via GitGitGadget
2023-01-22 6:12 ` [PATCH v4 5/9] rebase: add coverage of other incompatible options Elijah Newren via GitGitGadget
2023-01-23 20:08 ` Phillip Wood
2023-01-24 2:36 ` Elijah Newren
2023-01-24 10:27 ` Phillip Wood
2023-01-24 13:16 ` Phillip Wood
2023-01-24 14:48 ` Junio C Hamano
2023-01-24 15:41 ` Elijah Newren
2023-01-24 16:48 ` Phillip Wood
2023-01-24 17:12 ` Elijah Newren
2023-01-24 19:21 ` Phillip Wood
2023-01-22 6:12 ` [PATCH v4 6/9] rebase: clarify the OPT_CMDMODE incompatibilities Elijah Newren via GitGitGadget
2023-01-22 6:12 ` [PATCH v4 7/9] rebase: fix formatting of rebase --reapply-cherry-picks option in docs Elijah Newren via GitGitGadget
2023-01-22 6:12 ` [PATCH v4 8/9] rebase: put rebase_options initialization in single place Elijah Newren via GitGitGadget
2023-01-22 6:12 ` [PATCH v4 9/9] rebase: provide better error message for apply options vs. merge config Elijah Newren via GitGitGadget
2023-01-23 15:56 ` [PATCH v4 0/9] rebase: fix several code/testing/documentation issues around flag incompatibilities Derrick Stolee
2023-01-24 2:05 ` Elijah Newren
2023-01-25 4:03 ` [PATCH v5 00/10] " Elijah Newren via GitGitGadget
2023-01-25 4:03 ` [PATCH v5 01/10] rebase: mark --update-refs as requiring the merge backend Elijah Newren via GitGitGadget
2023-01-25 4:03 ` [PATCH v5 02/10] rebase: flag --apply and --merge as incompatible Elijah Newren via GitGitGadget
2023-01-25 4:03 ` [PATCH v5 03/10] rebase: remove --allow-empty-message from incompatible opts Elijah Newren via GitGitGadget
2023-01-25 4:03 ` [PATCH v5 04/10] rebase: fix docs about incompatibilities with --root Elijah Newren via GitGitGadget
2023-01-25 4:03 ` [PATCH v5 05/10] rebase: fix incompatiblity checks for --[no-]reapply-cherry-picks Elijah Newren via GitGitGadget
2023-01-25 14:14 ` Phillip Wood
2023-01-25 4:03 ` [PATCH v5 06/10] rebase: add coverage of other incompatible options Elijah Newren via GitGitGadget
2023-01-25 4:03 ` [PATCH v5 07/10] rebase: clarify the OPT_CMDMODE incompatibilities Elijah Newren via GitGitGadget
2023-01-25 4:03 ` [PATCH v5 08/10] rebase: fix formatting of rebase --reapply-cherry-picks option in docs Elijah Newren via GitGitGadget
2023-01-25 4:03 ` [PATCH v5 09/10] rebase: put rebase_options initialization in single place Elijah Newren via GitGitGadget
2023-01-25 4:03 ` [PATCH v5 10/10] rebase: provide better error message for apply options vs. merge config Elijah Newren via GitGitGadget
2023-01-25 14:17 ` [PATCH v5 00/10] rebase: fix several code/testing/documentation issues around flag incompatibilities Phillip Wood
2023-01-25 16:39 ` Junio C Hamano
2023-01-25 16:48 ` Elijah Newren [this message]
2023-02-02 10:29 ` rebase --merge vs --whitespace=fix, was " Johannes Schindelin
2023-02-02 23:48 ` Elijah Newren
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=CABPp-BEWC_GQXLKvokLVgd4-Hq16MoZggyp6r-sj29SYyLippQ@mail.gmail.com \
--to=newren@gmail.com \
--cc=derrickstolee@github.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=gitster@pobox.com \
--cc=martin.agren@gmail.com \
--cc=phillip.wood123@gmail.com \
--cc=sunshine@sunshineco.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).