diff options
author | Junio C Hamano <gitster@pobox.com> | 2017-12-27 22:16:27 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-12-27 22:16:27 +0300 |
commit | e2e2bf2450f96407976ac435489fd86b70728e3f (patch) | |
tree | bbf95a5c45f986a616c81cf3fa62d1fdef0727bd /Documentation | |
parent | 54b1335ae3ced34310fbc2abc92431a2a7f1f7fa (diff) | |
parent | 5a03360e731eca7a936b4bb2bec5a7f4010e9c62 (diff) |
Merge branch 'tb/delimit-pretty-trailers-args-with-comma'
Doc updates.
* tb/delimit-pretty-trailers-args-with-comma:
docs/pretty-formats: mention commas in %(trailers) syntax
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/pretty-formats.txt | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/Documentation/pretty-formats.txt b/Documentation/pretty-formats.txt index d433d50f81..e664c088a5 100644 --- a/Documentation/pretty-formats.txt +++ b/Documentation/pretty-formats.txt @@ -204,11 +204,13 @@ endif::git-rev-list[] than given and there are spaces on its left, use those spaces - '%><(<N>)', '%><|(<N>)': similar to '% <(<N>)', '%<|(<N>)' respectively, but padding both sides (i.e. the text is centered) -- %(trailers): display the trailers of the body as interpreted by - linkgit:git-interpret-trailers[1]. If the `:only` option is given, - omit non-trailer lines from the trailer block. If the `:unfold` - option is given, behave as if interpret-trailer's `--unfold` option - was given. E.g., `%(trailers:only:unfold)` to do both. +- %(trailers[:options]): display the trailers of the body as interpreted + by linkgit:git-interpret-trailers[1]. The `trailers` string may be + followed by a colon and zero or more comma-separated options. If the + `only` option is given, omit non-trailer lines from the trailer block. + If the `unfold` option is given, behave as if interpret-trailer's + `--unfold` option was given. E.g., `%(trailers:only,unfold)` to do + both. NOTE: Some placeholders may depend on other options given to the revision traversal engine. For example, the `%g*` reflog options will |