Re: What's cooking in git.git (Apr 2025, #01; Mon, 7)

From: Philippe Blain <levraiphilippeblain@gmail.com>
Date: Apr 9, 2025, 11:24 UTC
Message-ID: <e9700234-324d-dc63-d91e-9b8f36fabc79@gmail.com>
In-Reply-To: <xmqqtt6znch3.fsf@gitster.g>

Hi Junio,

Le 2025-04-07 à 12:49, Junio C Hamano a écrit :

Show 7 quoted lines

> * pb/status-rebase-fixes (2025-03-28) 4 commits
>  - wt-status: suggest 'git rebase --continue' to conclude 'merge' instruction
>  - wt-status: also abbreviate 'merge' and 'fixup -C' lines during rebase
>  - SQUASH??? - <CAPig+cS92W_gYuNsaTvQxiP3xBK7Wpg0__uVkgAU1x0OFJUZgQ@mail.gmail.com>
>  - rebase -r: do create merge commit after empty resolution
> 
>  A few fixes around "git status" while "git rebase" is running.

Note: the first commit is really a 'git rebase' fix, and does not concern
'git status' at all. I think this should be mentioned in the release notes,
or if you prefer I could split it into a separate series.

>  Comments?  It probably deserves a clarifying reroll.
>  cf. <c2f93d99-2f4d-ee6d-7087-42320c6df0f2@gmx.de>
>  source: <pull.1897.git.1743181401.gitgitgadget@gmail.com>

Yes, I will address the reviewer feedback and send a new version.

Thanks, Philippe.