From: Phillip Wood <phillip.wood123@gmail.com>
To: Junio C Hamano <gitster@pobox.com>, git@vger.kernel.org
Subject: pw/rebase-reflog-fixes (was Re: What's cooking in git.git (Oct 2022, #06; Wed, 19))
Date: Thu, 20 Oct 2022 10:56:19 +0100 [thread overview]
Message-ID: <3ed29217-ac10-c5e3-ae7e-969b7f55d058@dunelm.org.uk> (raw)
In-Reply-To: <xmqqa65rnuvv.fsf@gitster.g>
Hi Junio
> * pw/rebase-reflog-fixes (2022-10-17) 9 commits
> - rebase: cleanup action handling
> - rebase --abort: improve reflog message
> - rebase --apply: make reflog messages match rebase --merge
> - rebase --apply: respect GIT_REFLOG_ACTION
> - rebase --merge: fix reflog message after skipping
> - rebase --merge: fix reflog when continuing
> - t3406: rework rebase reflog tests
> - rebase --apply: remove duplicated code
> - Merge branch 'pw/rebase-keep-base-fixes' into pw/rebase-reflog-fixes
> (this branch uses pw/rebase-keep-base-fixes.)
>
> Fix some bugs in the reflog messages when rebasing and changes the
> reflog messages of "rebase --apply" to match "rebase --merge" with
> the aim of making the reflog easier to parse.
>
> Will merge to 'next'??
> source: <pull.1150.v3.git.1665567312.gitgitgadget@gmail.com>
Can you hold off on this one please, I'm planning to re-roll next week
to address <xmqq35brh9re.fsf@gitster.g>
Thanks
Phillip
next prev parent reply other threads:[~2022-10-20 9:56 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-20 1:31 What's cooking in git.git (Oct 2022, #06; Wed, 19) Junio C Hamano
2022-10-20 6:18 ` Jeff King
2022-10-20 15:38 ` Junio C Hamano
2022-10-20 9:56 ` Phillip Wood [this message]
2022-10-21 1:16 ` Michael McClimon
2022-10-21 4:55 ` Jeff King
2022-10-21 19:45 ` Glen Choo
2022-10-22 22:11 ` Jeff King
2022-10-21 3:15 ` tb/remove-unused-pack-bitmap Taylor Blau
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=3ed29217-ac10-c5e3-ae7e-969b7f55d058@dunelm.org.uk \
--to=phillip.wood123@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=phillip.wood@dunelm.org.uk \
/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).