Skip to content

Commit 3e64176

Browse files
committed
Merge branch 'sa/cat-file-mailmap--batch-check'
Docfix. * sa/cat-file-mailmap--batch-check: git-cat-file.txt: fix list continuations rendering literally
2 parents ce400c9 + 8534bb4 commit 3e64176

File tree

1 file changed

+12
-7
lines changed

1 file changed

+12
-7
lines changed

Documentation/git-cat-file.txt

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -93,47 +93,52 @@ OPTIONS
9393
Print object information and contents for each object provided
9494
on stdin. May not be combined with any other options or arguments
9595
except `--textconv`, `--filters`, or `--use-mailmap`.
96-
+
96+
+
97+
--
9798
* When used with `--textconv` or `--filters`, the input lines
9899
must specify the path, separated by whitespace. See the section
99100
`BATCH OUTPUT` below for details.
100-
+
101+
101102
* When used with `--use-mailmap`, for commit and tag objects, the
102103
contents part of the output shows the identities replaced using the
103104
mailmap mechanism, while the information part of the output shows
104105
the size of the object as if it actually recorded the replacement
105106
identities.
107+
--
106108

107109
--batch-check::
108110
--batch-check=<format>::
109111
Print object information for each object provided on stdin. May not be
110112
combined with any other options or arguments except `--textconv`, `--filters`
111113
or `--use-mailmap`.
112-
+
114+
+
115+
--
113116
* When used with `--textconv` or `--filters`, the input lines must
114117
specify the path, separated by whitespace. See the section
115118
`BATCH OUTPUT` below for details.
116-
+
119+
117120
* When used with `--use-mailmap`, for commit and tag objects, the
118121
printed object information shows the size of the object as if the
119122
identities recorded in it were replaced by the mailmap mechanism.
123+
--
120124

121125
--batch-command::
122126
--batch-command=<format>::
123127
Enter a command mode that reads commands and arguments from stdin. May
124128
only be combined with `--buffer`, `--textconv`, `--use-mailmap` or
125129
`--filters`.
126-
+
130+
+
131+
--
127132
* When used with `--textconv` or `--filters`, the input lines must
128133
specify the path, separated by whitespace. See the section
129134
`BATCH OUTPUT` below for details.
130-
+
135+
131136
* When used with `--use-mailmap`, for commit and tag objects, the
132137
`contents` command shows the identities replaced using the
133138
mailmap mechanism, while the `info` command shows the size
134139
of the object as if it actually recorded the replacement
135140
identities.
136-
141+
--
137142
+
138143
`--batch-command` recognizes the following commands:
139144
+

0 commit comments

Comments
 (0)