* [PATCH] name-rev: replace --stdin with --annotate-stdin in synopsis
@ 2022-02-15 20:52 John Cai via GitGitGadget
2022-02-16 1:40 ` Junio C Hamano
0 siblings, 1 reply; 2+ messages in thread
From: John Cai via GitGitGadget @ 2022-02-15 20:52 UTC (permalink / raw)
To: git; +Cc: John Cai, John Cai
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.
Signed-off-by: John Cai <johncai86@gmail.com>
---
name-rev: replace --stdin with --annotate-stdin in synopsis
There was an oversight when we added --annotate-stdin to
git-name-rev(1). This patch corrects it by making the appropriate change
in the synopsis of git-name-rev(1)
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-1216%2Fjohn-cai%2Fjc-update-name-rev-synopsis-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-1216/john-cai/jc-update-name-rev-synopsis-v1
Pull-Request: https://github.com/git/git/pull/1216
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 138e3c30a2b..929591269dd 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
};
base-commit: b80121027d1247a0754b3cc46897fee75c050b44
--
gitgitgadget
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] name-rev: replace --stdin with --annotate-stdin in synopsis
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
0 siblings, 0 replies; 2+ messages in thread
From: Junio C Hamano @ 2022-02-16 1:40 UTC (permalink / raw)
To: John Cai via GitGitGadget; +Cc: git, John Cai
"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
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-02-16 1:40 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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 is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.