git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Philippe Blain <levraiphilippeblain@gmail.com>
To: Junio C Hamano <gitster@pobox.com>, git@vger.kernel.org
Subject: Re: What's cooking in git.git (Apr 2025, #01; Mon, 7)
Date: Wed, 9 Apr 2025 07:24:36 -0400	[thread overview]
Message-ID: <e9700234-324d-dc63-d91e-9b8f36fabc79@gmail.com> (raw)
In-Reply-To: <xmqqtt6znch3.fsf@gitster.g>

Hi Junio,

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

> * 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.

  parent reply	other threads:[~2025-04-09 11:24 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-04-07 16:49 What's cooking in git.git (Apr 2025, #01; Mon, 7) Junio C Hamano
2025-04-08  6:22 ` Patrick Steinhardt
2025-04-08 14:50   ` Junio C Hamano
2025-04-09 11:31     ` Philippe Blain
2025-04-09 15:59       ` Junio C Hamano
2025-04-08  8:20 ` Karthik Nayak
2025-04-09 11:24 ` Philippe Blain [this message]
2025-04-09 16:01   ` Junio C Hamano
2025-06-05 12:51   ` Junio C Hamano
2025-06-05 15:10     ` Philippe Blain
2025-06-05 18:29       ` 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=e9700234-324d-dc63-d91e-9b8f36fabc79@gmail.com \
    --to=levraiphilippeblain@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.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).