git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: "John Cai via GitGitGadget" <gitgitgadget@gmail.com>
Cc: git@vger.kernel.org, John Cai <johncai86@gmail.com>
Subject: Re: [PATCH] name-rev: replace --stdin with --annotate-stdin in synopsis
Date: Tue, 15 Feb 2022 17:40:05 -0800	[thread overview]
Message-ID: <xmqqbkz7y4ga.fsf@gitster.g> (raw)
In-Reply-To: <pull.1216.git.git.1644958327302.gitgitgadget@gmail.com> (John Cai via GitGitGadget's message of "Tue, 15 Feb 2022 20:52:07 +0000")

"John Cai via GitGitGadget" <gitgitgadget@gmail.com> writes:

> From: John Cai <johncai86@gmail.com>
>
> d9976b184596 added --annotate-stdin to replace --stdin as a clearer flag
> name. Since --stdin is to be deprecated, we should replace --stdin in
> the synopsis.

Thanks for a careful reading.  d9976b184596 was what merged the
whole series; let's blame the particular step instead.

Here is what I'll queue.

----- >8 --------- >8 --------- >8 --------- >8 --------- >8 -----
From: John Cai <johncai86@gmail.com>
Date: Tue, 15 Feb 2022 20:52:07 +0000
Subject: [PATCH] name-rev: replace --stdin with --annotate-stdin in synopsis

34ae3b70 (name-rev: deprecate --stdin in favor of --annotate-stdin,
2022-01-05) added --annotate-stdin to replace --stdin as a clearer
flag name. Since --stdin is to be deprecated, we should replace
--stdin in the output from "git name-rev -h".

Signed-off-by: John Cai <johncai86@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
 builtin/name-rev.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/builtin/name-rev.c b/builtin/name-rev.c
index 138e3c30a2..929591269d 100644
--- a/builtin/name-rev.c
+++ b/builtin/name-rev.c
@@ -473,7 +473,7 @@ static void show_name(const struct object *obj,
 static char const * const name_rev_usage[] = {
 	N_("git name-rev [<options>] <commit>..."),
 	N_("git name-rev [<options>] --all"),
-	N_("git name-rev [<options>] --stdin"),
+	N_("git name-rev [<options>] --annotate-stdin"),
 	NULL
 };
 
-- 
2.35.1-129-gb80121027d


      reply	other threads:[~2022-02-16  1:40 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-02-15 20:52 [PATCH] name-rev: replace --stdin with --annotate-stdin in synopsis John Cai via GitGitGadget
2022-02-16  1:40 ` Junio C Hamano [this message]

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=xmqqbkz7y4ga.fsf@gitster.g \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=gitgitgadget@gmail.com \
    --cc=johncai86@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).