aboutsummaryrefslogtreecommitdiffstats
path: root/builtin
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2023-10-18 13:25:41 -0700
committerJunio C Hamano <gitster@pobox.com>2023-10-18 13:25:41 -0700
commitcc7d7183f0a95ef5d7853106515db8b7c495997d (patch)
tree6e7473aef89c2d6572eee724670a49210772653e /builtin
parentMerge branch 'xz/commit-title-soft-limit-doc' (diff)
parentdoc/cat-file: make synopsis and description less confusing (diff)
downloadgit-cc7d7183f0a95ef5d7853106515db8b7c495997d.tar.gz
git-cc7d7183f0a95ef5d7853106515db8b7c495997d.zip
Merge branch 'sn/cat-file-doc-update'
"git cat-file" documentation updates. * sn/cat-file-doc-update: doc/cat-file: make synopsis and description less confusing
Diffstat (limited to 'builtin')
-rw-r--r--builtin/cat-file.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/cat-file.c b/builtin/cat-file.c
index 694c8538df..ea8ad601ec 100644
--- a/builtin/cat-file.c
+++ b/builtin/cat-file.c
@@ -922,11 +922,11 @@ int cmd_cat_file(int argc, const char **argv, const char *prefix)
N_("git cat-file <type> <object>"),
N_("git cat-file (-e | -p) <object>"),
N_("git cat-file (-t | -s) [--allow-unknown-type] <object>"),
+ N_("git cat-file (--textconv | --filters)\n"
+ " [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]"),
N_("git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]\n"
" [--buffer] [--follow-symlinks] [--unordered]\n"
" [--textconv | --filters] [-Z]"),
- N_("git cat-file (--textconv | --filters)\n"
- " [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]"),
NULL
};
const struct option options[] = {