docs/pretty-formats: mention commas in %(trailers) syntax
Commit 84ff053d47 (pretty.c: delimit "%(trailers)" arguments with ",", 2017-10-01) switched the syntax of the trailers placeholder, but forgot to update the documentation in pretty-formats.txt. There's no need to mention the old syntax; it was never in a released version of Git. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jeff King committed
Dec 8, 2017 at 00:16 UTC
5a03360e731eca7a936b4bb2bec5a7f4010e9c62
1 file changed
+7
-5
Documentation/pretty-formats.txt
+7
-5
@@ -204,11 +204,13 @@ endif::git-rev-list[]
204
than given and there are spaces on its left, use those spaces
205
- '%><(<N>)', '%><|(<N>)': similar to '% <(<N>)', '%<|(<N>)'
206
respectively, but padding both sides (i.e. the text is centered)
207
-- %(trailers): display the trailers of the body as interpreted by
208
- linkgit:git-interpret-trailers[1]. If the `:only` option is given,
209
- omit non-trailer lines from the trailer block. If the `:unfold`
210
- option is given, behave as if interpret-trailer's `--unfold` option
211
- was given. E.g., `%(trailers:only:unfold)` to do both.
207
+- %(trailers[:options]): display the trailers of the body as interpreted
208
+ by linkgit:git-interpret-trailers[1]. The `trailers` string may be
209
+ followed by a colon and zero or more comma-separated options. If the
210
+ `only` option is given, omit non-trailer lines from the trailer block.
211
+ If the `unfold` option is given, behave as if interpret-trailer's
212
+ `--unfold` option was given. E.g., `%(trailers:only,unfold)` to do
213
+ both.
214
215
NOTE: Some placeholders may depend on other options given to the
216
revision traversal engine. For example, the `%g*` reflog options will