From: Junio C Hamano <gitster@pobox.com>
To: Phillip Wood <phillip.wood123@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: What's cooking in git.git (Jul 2023, #05; Tue, 25)
Date: Wed, 26 Jul 2023 09:34:09 -0700 [thread overview]
Message-ID: <xmqqpm4eeiny.fsf@gitster.g> (raw)
In-Reply-To: <9d2f119d-7da7-003d-d011-5c3aa7f94ae7@gmail.com> (Phillip Wood's message of "Wed, 26 Jul 2023 14:11:45 +0100")
Phillip Wood <phillip.wood123@gmail.com> writes:
> On 25/07/2023 21:57, Junio C Hamano wrote:
>> * pw/rebase-i-after-failure (2023-04-21) 6 commits
>> - rebase -i: fix adding failed command to the todo list
>> - rebase: fix rewritten list for failed pick
>> - rebase --continue: refuse to commit after failed command
>> - sequencer: factor out part of pick_commits()
>> - rebase -i: remove patch file after conflict resolution
>> - rebase -i: move unlink() calls
>> Various fixes to the behaviour of "rebase -i" when the command got
>> interrupted by conflicting changes.
>> Will discard.
>> Have been expecting a reroll for too long.
>
> I am slowly working on a new version, but it probably makes sense to
> drop it in the meantime as it has been so long that the new version
> probably wants to be rebased onto master anyway.
Yeah, I think that is a good next step. Unfortunately, folks who
have seen this round would likely have already forgotten and the
updated round would need fresh reviews anyway.
Thanks.
next prev parent reply other threads:[~2023-07-26 16:34 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-25 20:57 What's cooking in git.git (Jul 2023, #05; Tue, 25) Junio C Hamano
2023-07-25 20:59 ` Junio C Hamano
2023-07-25 21:17 ` Kousik Sanagavarapu
2023-07-25 21:50 ` Junio C Hamano
2023-07-26 2:41 ` Kousik Sanagavarapu
2023-07-25 22:39 ` Taylor Blau
2023-07-25 23:59 ` Junio C Hamano
2023-07-26 13:11 ` Phillip Wood
2023-07-26 16:34 ` Junio C Hamano [this message]
2023-07-27 21:24 ` Linus Arver
2023-07-27 21:52 ` Junio C Hamano
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqpm4eeiny.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=phillip.wood123@gmail.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.
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 NNTP newsgroup(s).