diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-07-09 14:00:41 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-07-09 14:00:41 -0700 |
| commit | 8251695fe72eed0b2ad9c3762ed53e04a7ee4f5e (patch) | |
| tree | 408bb0fad1f68c80c3052e931872b357fecae843 | |
| parent | 4a0fcf9f760c9774be77f51e1e88a7499b53d2e2 (diff) | |
| parent | 0172f7834a31ae7cb9873feaaaa63939352fa3ae (diff) | |
| download | git-8251695fe72eed0b2ad9c3762ed53e04a7ee4f5e.tar.xz | |
Merge branch 'cc/cat-file-usage-update' into master
Doc/usage update.
* cc/cat-file-usage-update:
cat-file: add missing [=<format>] to usage/synopsis
| -rw-r--r-- | Documentation/git-cat-file.txt | 2 | ||||
| -rw-r--r-- | builtin/cat-file.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-cat-file.txt b/Documentation/git-cat-file.txt index 8eca671b82..8e192d87db 100644 --- a/Documentation/git-cat-file.txt +++ b/Documentation/git-cat-file.txt @@ -10,7 +10,7 @@ SYNOPSIS -------- [verse] 'git cat-file' (-t [--allow-unknown-type]| -s [--allow-unknown-type]| -e | -p | <type> | --textconv | --filters ) [--path=<path>] <object> -'git cat-file' (--batch | --batch-check) [ --textconv | --filters ] [--follow-symlinks] +'git cat-file' (--batch[=<format>] | --batch-check[=<format>]) [ --textconv | --filters ] [--follow-symlinks] DESCRIPTION ----------- diff --git a/builtin/cat-file.c b/builtin/cat-file.c index ae18e20a7c..5ebf13359e 100644 --- a/builtin/cat-file.c +++ b/builtin/cat-file.c @@ -596,7 +596,7 @@ static int batch_objects(struct batch_options *opt) static const char * const cat_file_usage[] = { N_("git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -p | <type> | --textconv | --filters) [--path=<path>] <object>"), - N_("git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --filters]"), + N_("git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-symlinks] [--textconv | --filters]"), NULL }; |