summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2023-01-27 16:51:40 (GMT)
committerJunio C Hamano <gitster@pobox.com>2023-01-27 16:51:40 (GMT)
commit3e6417681c9b9498995efb3e26e8e05e8a1088c3 (patch)
tree2586220c8ee5beed80f0a7dd6710fc723f8bf8e7 /Documentation
parentce400c9da9657e08f50fee9c28c7bf034e28ab2b (diff)
parent8534bb4cb1329612bb749dcb7a6f27181d3becbd (diff)
downloadgit-3e6417681c9b9498995efb3e26e8e05e8a1088c3.zip
git-3e6417681c9b9498995efb3e26e8e05e8a1088c3.tar.gz
git-3e6417681c9b9498995efb3e26e8e05e8a1088c3.tar.bz2
Merge branch 'sa/cat-file-mailmap--batch-check'
Docfix. * sa/cat-file-mailmap--batch-check: git-cat-file.txt: fix list continuations rendering literally
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-cat-file.txt19
1 files changed, 12 insertions, 7 deletions
diff --git a/Documentation/git-cat-file.txt b/Documentation/git-cat-file.txt
index 830f0a2..411de2e 100644
--- a/Documentation/git-cat-file.txt
+++ b/Documentation/git-cat-file.txt
@@ -93,47 +93,52 @@ OPTIONS
Print object information and contents for each object provided
on stdin. May not be combined with any other options or arguments
except `--textconv`, `--filters`, or `--use-mailmap`.
- +
++
+--
* When used with `--textconv` or `--filters`, the input lines
must specify the path, separated by whitespace. See the section
`BATCH OUTPUT` below for details.
- +
+
* When used with `--use-mailmap`, for commit and tag objects, the
contents part of the output shows the identities replaced using the
mailmap mechanism, while the information part of the output shows
the size of the object as if it actually recorded the replacement
identities.
+--
--batch-check::
--batch-check=<format>::
Print object information for each object provided on stdin. May not be
combined with any other options or arguments except `--textconv`, `--filters`
or `--use-mailmap`.
- +
++
+--
* When used with `--textconv` or `--filters`, the input lines must
specify the path, separated by whitespace. See the section
`BATCH OUTPUT` below for details.
- +
+
* When used with `--use-mailmap`, for commit and tag objects, the
printed object information shows the size of the object as if the
identities recorded in it were replaced by the mailmap mechanism.
+--
--batch-command::
--batch-command=<format>::
Enter a command mode that reads commands and arguments from stdin. May
only be combined with `--buffer`, `--textconv`, `--use-mailmap` or
`--filters`.
- +
++
+--
* When used with `--textconv` or `--filters`, the input lines must
specify the path, separated by whitespace. See the section
`BATCH OUTPUT` below for details.
- +
+
* When used with `--use-mailmap`, for commit and tag objects, the
`contents` command shows the identities replaced using the
mailmap mechanism, while the `info` command shows the size
of the object as if it actually recorded the replacement
identities.
-
+--
+
`--batch-command` recognizes the following commands:
+