[PATCH] you_still_use_that(): reword the instructions

[PATCH] you_still_use_that(): reword the instructions

[Junio C Hamano]

The message is overly long and may mislead readers into thinking
there is recourse other than adopting the new workflow.  Clarify
that it merely helps them find a replacement, rather than offering
to reconsider a decision that has already taken effect.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
 usage.c | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git c/usage.c w/usage.c
index 3f0118ab2a..9933b9911c 100644
--- c/usage.c
+++ w/usage.c
@@ -392,15 +392,13 @@ NORETURN void you_still_use_that(const char *command_name, const char *hint)
 		fputs(hint, stderr);
 
 	fprintf(stderr,
-		_("If you still use this command, here's what you can do:\n"
+		_("If you need a replacement:\n"
 		  "\n"
-		  "- read https://git-scm.com/docs/BreakingChanges.html\n"
-		  "- check if anyone has discussed this on the mailing\n"
-		  "  list and if they came up with something that can\n"
-		  "  help you: https://lore.kernel.org/git/?q=%s\n"
-		  "- send an email to <git@vger.kernel.org> to let us\n"
-		  "  know that you still use this command and were unable\n"
-		  "  to determine a suitable replacement\n"
+		  "- Read https://git-scm.com/docs/BreakingChanges.html.\n\n"
+		  "- Check what others on the mailing suggest as a replacement:\n"
+		  "  https://lore.kernel.org/git/?q=%s\n\n"
+		  "- Send an email to <git@vger.kernel.org> asking for help, only if\n"
+		  "  suggestions by others do not work for you.\n"
 		  "\n"),
 		percent_encoded.buf);
 	strbuf_release(&percent_encoded);

Re: [PATCH] you_still_use_that(): reword the instructions

[Michael Montalbo]

On Wed, Aug 26, 2026 at 7:33 AM Junio C Hamano <gitster@pobox.com> wrote:
>
> The message is overly long and may mislead readers into thinking
> there is recourse other than adopting the new workflow.  Clarify
> that it merely helps them find a replacement, rather than offering
> to reconsider a decision that has already taken effect.
>

I think this change makes sense.

> +                 "- Send an email to <git@vger.kernel.org> asking for help, only if\n"
> +                 "  suggestions by others do not work for you.\n"

Maybe a slight reword to reinforce the idea that the command is not coming
back:

  "Send an email... asking for help, only if suggested replacements
    for the [now?] deprecated command do not work for you."

Other than that suggestion, I think the change looks good.

Re: [PATCH] you_still_use_that(): reword the instructions

[Junio C Hamano]

Michael Montalbo <mmontalbo@gmail.com> writes:

> I think this change makes sense.
>
>> +                 "- Send an email to <git@vger.kernel.org> asking for help, only if\n"
>> +                 "  suggestions by others do not work for you.\n"
>
> Maybe a slight reword to reinforce the idea that the command is not coming
> back:
>
>   "Send an email... asking for help, only if suggested replacements
>     for the [now?] deprecated command do not work for you."
>
> Other than that suggestion, I think the change looks good.

Not repeating 'replacement' there was deliberate for two reasons.
First, the preceding instruction mentions others suggesting
replacements, presenting an obvious opportunity to keep the wording
concise.  Second, this message is meant to be generic.  For a case
like 'whatschanged', the "new workflow" is to use another command
(i.e., 'replacement'), but other cases may involve doing things
differently and are not limited to a simple replacement with another
command.  

And that is why the message only says "suggestions by others".

Re: [PATCH] you_still_use_that(): reword the instructions

[Michael Montalbo]

On Wed, Aug 26, 2026 at 10:00 AM Junio C Hamano <gitster@pobox.com> wrote:
>
> Michael Montalbo <mmontalbo@gmail.com> writes:
>
> > I think this change makes sense.
> >
> >> +                 "- Send an email to <git@vger.kernel.org> asking for help, only if\n"
> >> +                 "  suggestions by others do not work for you.\n"
> >
> > Maybe a slight reword to reinforce the idea that the command is not coming
> > back:
> >
> >   "Send an email... asking for help, only if suggested replacements
> >     for the [now?] deprecated command do not work for you."
> >
> > Other than that suggestion, I think the change looks good.
>
> Not repeating 'replacement' there was deliberate for two reasons.
> First, the preceding instruction mentions others suggesting
> replacements, presenting an obvious opportunity to keep the wording
> concise.  Second, this message is meant to be generic.  For a case
> like 'whatschanged', the "new workflow" is to use another command
> (i.e., 'replacement'), but other cases may involve doing things
> differently and are not limited to a simple replacement with another
> command.
>
> And that is why the message only says "suggestions by others".

Got it, the reasoning for removing 'replacement' makes sense. Thank you.

Adding something like "[now] deprecated" or otherwise more explicitly
suggesting the command does not intend to return is my main feedback.

Re: [PATCH] you_still_use_that(): reword the instructions

[Michael Montalbo]

On Wed, Aug 26, 2026 at 10:12 AM Michael Montalbo <mmontalbo@gmail.com> wrote:
>
> Adding something like "[now] deprecated" or otherwise more explicitly
> suggesting the command does not intend to return is my main feedback.

Maybe:
  "Send an email..., only if suggested alternatives to the deprecated workflow
   do not work for you."

Only a minor suggestion in the end. The general cleanup to the text seems good.

Re: [PATCH] you_still_use_that(): reword the instructions

[Junio C Hamano]

Michael Montalbo <mmontalbo@gmail.com> writes:

> On Wed, Aug 26, 2026 at 10:00 AM Junio C Hamano <gitster@pobox.com> wrote:
>>
>> Michael Montalbo <mmontalbo@gmail.com> writes:
>>
>> > I think this change makes sense.
>> >
>> >> +                 "- Send an email to <git@vger.kernel.org> asking for help, only if\n"
>> >> +                 "  suggestions by others do not work for you.\n"
>> >
>> > Maybe a slight reword to reinforce the idea that the command is not coming
>> > back:
>> >
>> >   "Send an email... asking for help, only if suggested replacements
>> >     for the [now?] deprecated command do not work for you."
>> ...
> Adding something like "[now] deprecated" or otherwise more explicitly
> suggesting the command does not intend to return is my main feedback.

The same function emits a message that says "this command is
nominated for removal."  Perhaps we want to strengthen that part by
saying "will be removed" instead?

Re: [PATCH] you_still_use_that(): reword the instructions

[Michael Montalbo]

On Wed, Aug 26, 2026 at 10:45 AM Junio C Hamano <gitster@pobox.com> wrote:
>
> Michael Montalbo <mmontalbo@gmail.com> writes:
>
> > On Wed, Aug 26, 2026 at 10:00 AM Junio C Hamano <gitster@pobox.com> wrote:
> >>
> >> Michael Montalbo <mmontalbo@gmail.com> writes:
> >>
> >> > I think this change makes sense.
> >> >
> >> >> +                 "- Send an email to <git@vger.kernel.org> asking for help, only if\n"
> >> >> +                 "  suggestions by others do not work for you.\n"
> >> >
> >> > Maybe a slight reword to reinforce the idea that the command is not coming
> >> > back:
> >> >
> >> >   "Send an email... asking for help, only if suggested replacements
> >> >     for the [now?] deprecated command do not work for you."
> >> ...
> > Adding something like "[now] deprecated" or otherwise more explicitly
> > suggesting the command does not intend to return is my main feedback.
>
> The same function emits a message that says "this command is
> nominated for removal."  Perhaps we want to strengthen that part by
> saying "will be removed" instead?

Yes, saying it "will be removed" sounds great to me.

Re: [PATCH] you_still_use_that(): reword the instructions

[Michael Montalbo]

On Wed, Aug 26, 2026 at 7:33 AM Junio C Hamano <gitster@pobox.com> wrote:
>
> diff --git c/usage.c w/usage.c
> index 3f0118ab2a..9933b9911c 100644
> --- c/usage.c
> +++ w/usage.c
> @@ -392,15 +392,13 @@ NORETURN void you_still_use_that(const char *command_name, const char *hint)
>                 fputs(hint, stderr);
>
>         fprintf(stderr,
> -               _("If you still use this command, here's what you can do:\n"
> +               _("If you need a replacement:\n"
>                   "\n"
> -                 "- read https://git-scm.com/docs/BreakingChanges.html\n"
> -                 "- check if anyone has discussed this on the mailing\n"
> -                 "  list and if they came up with something that can\n"
> -                 "  help you: https://lore.kernel.org/git/?q=%s\n"
> -                 "- send an email to <git@vger.kernel.org> to let us\n"
> -                 "  know that you still use this command and were unable\n"
> -                 "  to determine a suitable replacement\n"
> +                 "- Read https://git-scm.com/docs/BreakingChanges.html.\n\n"

I noticed there are now two newlines at the end instead of one like before. Same
for the lore link below. Is that intentional?

> +                 "- Check what others on the mailing suggest as a replacement:\n"
> +                 "  https://lore.kernel.org/git/?q=%s\n\n"
> +                 "- Send an email to <git@vger.kernel.org> asking for help, only if\n"
> +                 "  suggestions by others do not work for you.\n"
>                   "\n"),
>                 percent_encoded.buf);
>         strbuf_release(&percent_encoded);
>

Re: [PATCH] you_still_use_that(): reword the instructions

[Junio C Hamano]

Michael Montalbo <mmontalbo@gmail.com> writes:

> On Wed, Aug 26, 2026 at 7:33 AM Junio C Hamano <gitster@pobox.com> wrote:
>>
>> diff --git c/usage.c w/usage.c
>> index 3f0118ab2a..9933b9911c 100644
>> --- c/usage.c
>> +++ w/usage.c
>> @@ -392,15 +392,13 @@ NORETURN void you_still_use_that(const char *command_name, const char *hint)
>>                 fputs(hint, stderr);
>>
>>         fprintf(stderr,
>> -               _("If you still use this command, here's what you can do:\n"
>> +               _("If you need a replacement:\n"
>>                   "\n"
>> -                 "- read https://git-scm.com/docs/BreakingChanges.html\n"
>> -                 "- check if anyone has discussed this on the mailing\n"
>> -                 "  list and if they came up with something that can\n"
>> -                 "  help you: https://lore.kernel.org/git/?q=%s\n"
>> -                 "- send an email to <git@vger.kernel.org> to let us\n"
>> -                 "  know that you still use this command and were unable\n"
>> -                 "  to determine a suitable replacement\n"
>> +                 "- Read https://git-scm.com/docs/BreakingChanges.html.\n\n"
>
> I noticed there are now two newlines at the end instead of one like before. Same
> for the lore link below. Is that intentional?

Absolutely.

>
>> +                 "- Check what others on the mailing suggest as a replacement:\n"
>> +                 "  https://lore.kernel.org/git/?q=%s\n\n"
>> +                 "- Send an email to <git@vger.kernel.org> asking for help, only if\n"
>> +                 "  suggestions by others do not work for you.\n"
>>                   "\n"),
>>                 percent_encoded.buf);
>>         strbuf_release(&percent_encoded);
>>

[PATCH v2] you_still_use_that(): reword the instructions

[Junio C Hamano]

The message is overly long and may mislead readers into thinking
there is recourse other than adopting the new workflow.  Clarify
that the message is there merely to help them find a replacement
workflow, and is not offering to reconsider a decision that has
already taken effect.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
 usage.c | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git c/usage.c w/usage.c
index 3f0118ab2a..365c0bcb90 100644
--- c/usage.c
+++ w/usage.c
@@ -386,21 +386,19 @@ NORETURN void you_still_use_that(const char *command_name, const char *hint)
 				 STRBUF_ENCODE_SLASH);
 
 	fprintf(stderr,
-		_("'%s' is nominated for removal.\n"), command_name);
+		_("'%s' will be removed soon.\n"), command_name);
 
 	if (hint)
 		fputs(hint, stderr);
 
 	fprintf(stderr,
-		_("If you still use this command, here's what you can do:\n"
+		_("If you need a replacement:\n"
 		  "\n"
-		  "- read https://git-scm.com/docs/BreakingChanges.html\n"
-		  "- check if anyone has discussed this on the mailing\n"
-		  "  list and if they came up with something that can\n"
-		  "  help you: https://lore.kernel.org/git/?q=%s\n"
-		  "- send an email to <git@vger.kernel.org> to let us\n"
-		  "  know that you still use this command and were unable\n"
-		  "  to determine a suitable replacement\n"
+		  "- Read https://git-scm.com/docs/BreakingChanges.html.\n\n"
+		  "- Check what others on the mailing suggest as a replacement:\n"
+		  "  https://lore.kernel.org/git/?q=%s\n\n"
+		  "- Send an email to <git@vger.kernel.org> asking for help, only if\n"
+		  "  suggestions by others do not work for you.\n"
 		  "\n"),
 		percent_encoded.buf);
 	strbuf_release(&percent_encoded);

Re: [PATCH v2] you_still_use_that(): reword the instructions

[Elijah Newren]

On Wed, Aug 26, 2026 at 10:50 AM Junio C Hamano <gitster@pobox.com> wrote:
>
> The message is overly long and may mislead readers into thinking
> there is recourse other than adopting the new workflow.  Clarify
> that the message is there merely to help them find a replacement
> workflow, and is not offering to reconsider a decision that has
> already taken effect.
>
> Signed-off-by: Junio C Hamano <gitster@pobox.com>
> ---
>  usage.c | 16 +++++++---------
>  1 file changed, 7 insertions(+), 9 deletions(-)
>
> diff --git c/usage.c w/usage.c
> index 3f0118ab2a..365c0bcb90 100644
> --- c/usage.c
> +++ w/usage.c
> @@ -386,21 +386,19 @@ NORETURN void you_still_use_that(const char *command_name, const char *hint)
>                                  STRBUF_ENCODE_SLASH);
>
>         fprintf(stderr,
> -               _("'%s' is nominated for removal.\n"), command_name);
> +               _("'%s' will be removed soon.\n"), command_name);
>
>         if (hint)
>                 fputs(hint, stderr);
>
>         fprintf(stderr,
> -               _("If you still use this command, here's what you can do:\n"
> +               _("If you need a replacement:\n"
>                   "\n"
> -                 "- read https://git-scm.com/docs/BreakingChanges.html\n"
> -                 "- check if anyone has discussed this on the mailing\n"
> -                 "  list and if they came up with something that can\n"
> -                 "  help you: https://lore.kernel.org/git/?q=%s\n"
> -                 "- send an email to <git@vger.kernel.org> to let us\n"
> -                 "  know that you still use this command and were unable\n"
> -                 "  to determine a suitable replacement\n"
> +                 "- Read https://git-scm.com/docs/BreakingChanges.html.\n\n"
> +                 "- Check what others on the mailing suggest as a replacement:\n"

missing "list"?  ("mailing [list] suggest")

> +                 "  https://lore.kernel.org/git/?q=%s\n\n"
> +                 "- Send an email to <git@vger.kernel.org> asking for help, only if\n"
> +                 "  suggestions by others do not work for you.\n"
>                   "\n"),
>                 percent_encoded.buf);
>         strbuf_release(&percent_encoded);

Otherwise, looks good.

Re: [PATCH v2] you_still_use_that(): reword the instructions

[Kristoffer Haugsbakk]

On Wed, Aug 26, 2026, at 19:48, Junio C Hamano wrote:
> The message is overly long and may mislead readers into thinking
> there is recourse other than adopting the new workflow.  Clarify
> that the message is there merely to help them find a replacement
> workflow, and is not offering to reconsider a decision that has
> already taken effect.
>
> Signed-off-by: Junio C Hamano <gitster@pobox.com>
> ---

From the responses on the thread there was one action point that was
agreed on and that is changed in this version. See the range diff at
the end of this message.[1]

Spotting the changes is harder than it needs to be when there are no
inter-version comments, range diff, or interdiff (any of them).

>  usage.c | 16 +++++++---------
>  1 file changed, 7 insertions(+), 9 deletions(-)
>
> diff --git c/usage.c w/usage.c
> index 3f0118ab2a..365c0bcb90 100644
> --- c/usage.c
> +++ w/usage.c
> @@ -386,21 +386,19 @@ NORETURN void you_still_use_that(const char
> *command_name, const char *hint)
>  				 STRBUF_ENCODE_SLASH);
>
>  	fprintf(stderr,
> -		_("'%s' is nominated for removal.\n"), command_name);
> +		_("'%s' will be removed soon.\n"), command_name);

I was thinking that maybe the final bullet point could say something
like

     ... and don’t send a message voting for it to come back because the
     decision has already been made

But it *could* be mentioned here instead. “The decision is final ...”

I bring this up because some replies have come in where they demonstrate
that they know what to do about it. But instead of doing it they vote
for the decision to be undone.[2]

    Kernel audio driver maintainer, here. The first thing I want to know
    about a branch is "whatchanged" - it tells me exactly what I want to
    know with no distractions. So I was horrified when I saw the removal
    nomination message.  Please reconsider - while git log can do it, I
    don't use git log... at all. I'd just have to add another alias that
    would be another thing to constantly collide with while using docker
    build chains with different (but usually older) versions of git.

(Although this was before you could alias deprecated commands but still.)

Honestly, it seems that some people would rather vote/lobby for the
continued maintenance of git-whatchanged(1) [3] rather than execute
one config change. That is just my general impression.

And I also bring this up because the commit message says:

     and [the message] is not offering to reconsider a decision that has
     already taken effect.

🔗 2: https://lore.kernel.org/git/BL3P221MB0449288C8B0FA448A227FD48833AA@BL3P221MB0449.NAMP221.PROD.OUTLOOK.COM/

† 3: This message is for the deprecated command git-pack-redundant(1)
     too but there hasn’t been any messages about wanting to get it back
     in the last year or so.

>
>  	if (hint)
>  		fputs(hint, stderr);
>
>  	fprintf(stderr,
> -		_("If you still use this command, here's what you can do:\n"
> +		_("If you need a replacement:\n"
>  		  "\n"
> -		  "- read https://git-scm.com/docs/BreakingChanges.html\n"
> -		  "- check if anyone has discussed this on the mailing\n"
> -		  "  list and if they came up with something that can\n"
> -		  "  help you: https://lore.kernel.org/git/?q=%s\n"
> -		  "- send an email to <git@vger.kernel.org> to let us\n"
> -		  "  know that you still use this command and were unable\n"
> -		  "  to determine a suitable replacement\n"
> +		  "- Read https://git-scm.com/docs/BreakingChanges.html.\n\n"
> +		  "- Check what others on the mailing suggest as a replacement:\n"
> +		  "  https://lore.kernel.org/git/?q=%s\n\n"
> +		  "- Send an email to <git@vger.kernel.org> asking for help, only if\n"
> +		  "  suggestions by others do not work for you.\n"
>  		  "\n"),
>  		percent_encoded.buf);
>  	strbuf_release(&percent_encoded);

The rest looks good.

What I like the most about this patch/change is that it is more
assertive and less wordy, e.g. just “If you need a replacement”
not a long ceremonial sentence “If you still use this command, ...”.

[1]:

1:  fd53eb2ca3a ! 1:  dca3205b1f6 you_still_use_that(): reword the instructions
    @@ Commit message

         The message is overly long and may mislead readers into thinking
         there is recourse other than adopting the new workflow.  Clarify
    -    that it merely helps them find a replacement, rather than offering
    -    to reconsider a decision that has already taken effect.
    +    that the message is there merely to help them find a replacement
    +    workflow, and is not offering to reconsider a decision that has
    +    already taken effect.

         Signed-off-by: Junio C Hamano <gitster@pobox.com>

      ## usage.c ##
     @@ usage.c: NORETURN void you_still_use_that(const char *command_name, const char *hint)
    + 				 STRBUF_ENCODE_SLASH);
    +
    + 	fprintf(stderr,
    +-		_("'%s' is nominated for removal.\n"), command_name);
    ++		_("'%s' will be removed soon.\n"), command_name);
    +
    + 	if (hint)
      		fputs(hint, stderr);

      	fprintf(stderr,

Re: [PATCH v2] you_still_use_that(): reword the instructions

[Junio C Hamano]

"Kristoffer Haugsbakk" <kristofferhaugsbakk@fastmail.com> writes:

> What I like the most about this patch/change is that it is more
> assertive and less wordy, e.g. just “If you need a replacement”
> not a long ceremonial sentence “If you still use this command, ...”.

Yes, that was exactly what I aimed for.  Thanks.

Re: [PATCH v2] you_still_use_that(): reword the instructions

[Junio C Hamano]

"Kristoffer Haugsbakk" <kristofferhaugsbakk@fastmail.com> writes:

> I was thinking that maybe the final bullet point could say something
> like
>
>      ... and don’t send a message voting for it to come back because the
>      decision has already been made
>
> But it *could* be mentioned here instead. “The decision is final ...”
> ...
> And I also bring this up because the commit message says:
>
>      and [the message] is not offering to reconsider a decision that has
>      already taken effect.

I forgot to respond to this part.  Yes, we could be more blunt and
explicitly state that bringing the issue back to the discussion
stage is way too late and unwelcome.

However, offering advice only on finding a replacement should be a
sufficient hint for any reasonably clueful person to understand that
it is far too late to suggest a reversal.  There will always be
those who demand that we revisit our decisions regardless of what we
tell them, and those people are unsalvageable.

[PATCH v3] you_still_use_that(): reword the instructions

[Junio C Hamano]

The message is overly long and may mislead readers into thinking
there is recourse other than adopting the new workflow.  Clarify
that the message is there merely to help them find a replacement
workflow, and is not offering to reconsider a decision that has
already taken effect.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

 * The text is unchanged from v2 except for fixing "mailing list";
   two tests that looked for "nominated for removal" string have
   been corrected.

 t/t4013-diff-various.sh   |  2 +-
 t/t5323-pack-redundant.sh |  2 +-
 usage.c                   | 16 +++++++---------
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/t/t4013-diff-various.sh b/t/t4013-diff-various.sh
index d35695f5b0..93d6e6e975 100755
--- a/t/t4013-diff-various.sh
+++ b/t/t4013-diff-various.sh
@@ -478,7 +478,7 @@ EOF
 
 test_expect_success !WITH_BREAKING_CHANGES 'whatchanged needs --i-still-use-this' '
 	test_must_fail git whatchanged >message 2>&1 &&
-	test_grep "nominated for removal" message
+	test_grep "will be removed soon" message
 '
 
 test_expect_success 'log -m matches pure log' '
diff --git a/t/t5323-pack-redundant.sh b/t/t5323-pack-redundant.sh
index 2d96afd6f7..aff0bce099 100755
--- a/t/t5323-pack-redundant.sh
+++ b/t/t5323-pack-redundant.sh
@@ -47,7 +47,7 @@ shared_repo=shared.git
 
 test_expect_success 'pack-redundant needs --i-still-use-this' '
 	test_must_fail git pack-redundant >message 2>&1 &&
-	test_grep "nominated for removal" message
+	test_grep "will be removed soon" message
 '
 
 git_pack_redundant='git pack-redundant --i-still-use-this'
diff --git a/usage.c b/usage.c
index 527edb1e79..90f392e89e 100644
--- a/usage.c
+++ b/usage.c
@@ -386,21 +386,19 @@ NORETURN void you_still_use_that(const char *command_name, const char *hint)
 				 STRBUF_ENCODE_SLASH);
 
 	fprintf(stderr,
-		_("'%s' is nominated for removal.\n"), command_name);
+		_("'%s' will be removed soon.\n"), command_name);
 
 	if (hint)
 		fputs(hint, stderr);
 
 	fprintf(stderr,
-		_("If you still use this command, here's what you can do:\n"
+		_("If you need a replacement:\n"
 		  "\n"
-		  "- read https://git-scm.com/docs/BreakingChanges.html\n"
-		  "- check if anyone has discussed this on the mailing\n"
-		  "  list and if they came up with something that can\n"
-		  "  help you: https://lore.kernel.org/git/?q=%s\n"
-		  "- send an email to <git@vger.kernel.org> to let us\n"
-		  "  know that you still use this command and were unable\n"
-		  "  to determine a suitable replacement\n"
+		  "- Read https://git-scm.com/docs/BreakingChanges.html.\n\n"
+		  "- Check what others on the mailing list suggest as a replacement:\n"
+		  "  https://lore.kernel.org/git/?q=%s\n\n"
+		  "- Send an email to <git@vger.kernel.org> asking for help, only if\n"
+		  "  suggestions by others do not work for you.\n"
 		  "\n"),
 		percent_encoded.buf);
 	strbuf_release(&percent_encoded);

Interdiff:
  diff --git a/t/t4013-diff-various.sh b/t/t4013-diff-various.sh
  index d35695f5b0..93d6e6e975 100755
  --- a/t/t4013-diff-various.sh
  +++ b/t/t4013-diff-various.sh
  @@ -478,7 +478,7 @@ EOF
   
   test_expect_success !WITH_BREAKING_CHANGES 'whatchanged needs --i-still-use-this' '
   	test_must_fail git whatchanged >message 2>&1 &&
  -	test_grep "nominated for removal" message
  +	test_grep "will be removed soon" message
   '
   
   test_expect_success 'log -m matches pure log' '
  diff --git a/t/t5323-pack-redundant.sh b/t/t5323-pack-redundant.sh
  index 2d96afd6f7..aff0bce099 100755
  --- a/t/t5323-pack-redundant.sh
  +++ b/t/t5323-pack-redundant.sh
  @@ -47,7 +47,7 @@ shared_repo=shared.git
   
   test_expect_success 'pack-redundant needs --i-still-use-this' '
   	test_must_fail git pack-redundant >message 2>&1 &&
  -	test_grep "nominated for removal" message
  +	test_grep "will be removed soon" message
   '
   
   git_pack_redundant='git pack-redundant --i-still-use-this'
  diff --git a/usage.c b/usage.c
  index d421ca426b..90f392e89e 100644
  --- a/usage.c
  +++ b/usage.c
  @@ -395,7 +395,7 @@ NORETURN void you_still_use_that(const char *command_name, const char *hint)
   		_("If you need a replacement:\n"
   		  "\n"
   		  "- Read https://git-scm.com/docs/BreakingChanges.html.\n\n"
  -		  "- Check what others on the mailing suggest as a replacement:\n"
  +		  "- Check what others on the mailing list suggest as a replacement:\n"
   		  "  https://lore.kernel.org/git/?q=%s\n\n"
   		  "- Send an email to <git@vger.kernel.org> asking for help, only if\n"
   		  "  suggestions by others do not work for you.\n"
-- 
2.55.0-862-g3c6f97f7b9