From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>,
"John Cai" <johncai86@gmail.com>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Subject: [PATCH] doc txt & -h consistency: fix recent "cat-file" inconsistency
Date: Thu, 7 Apr 2022 21:08:59 +0200 [thread overview]
Message-ID: <patch-1.1-79404e05d73-20220407T185645Z-avarab@gmail.com> (raw)
The cat-file SYNOPSIS and help output were made consistent in
83dc443439c (cat-file: don't whitespace-pad "(...)" in SYNOPSIS and
usage output, 2022-01-10).
They then drifted apart again in 440c705ea63 (cat-file: add
--batch-command mode, 2022-02-18). Let's fix that and list the new
--batch-command option in the SYNOPSIS section.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
---
Documentation/git-cat-file.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Documentation/git-cat-file.txt b/Documentation/git-cat-file.txt
index 70c5b4f12d1..24a811f0ef6 100644
--- a/Documentation/git-cat-file.txt
+++ b/Documentation/git-cat-file.txt
@@ -12,7 +12,7 @@ SYNOPSIS
'git cat-file' <type> <object>
'git cat-file' (-e | -p) <object>
'git cat-file' (-t | -s) [--allow-unknown-type] <object>
-'git cat-file' (--batch | --batch-check) [--batch-all-objects]
+'git cat-file' (--batch | --batch-check | --batch-command) [--batch-all-objects]
[--buffer] [--follow-symlinks] [--unordered]
[--textconv | --filters]
'git cat-file' (--textconv | --filters)
--
2.36.0.rc0.849.g2d5b5d9ab01
next reply other threads:[~2022-04-07 19:09 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-07 19:08 Ævar Arnfjörð Bjarmason [this message]
2022-04-07 20:27 ` [PATCH] doc txt & -h consistency: fix recent "cat-file" inconsistency Junio C Hamano
2022-04-08 8:55 ` Ævar Arnfjörð Bjarmason
2022-04-08 18:33 ` 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=patch-1.1-79404e05d73-20220407T185645Z-avarab@gmail.com \
--to=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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).