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
This commit is contained in:
commit
e2e2bf2450
@ -204,11 +204,13 @@ endif::git-rev-list[]
|
|||||||
than given and there are spaces on its left, use those spaces
|
than given and there are spaces on its left, use those spaces
|
||||||
- '%><(<N>)', '%><|(<N>)': similar to '% <(<N>)', '%<|(<N>)'
|
- '%><(<N>)', '%><|(<N>)': similar to '% <(<N>)', '%<|(<N>)'
|
||||||
respectively, but padding both sides (i.e. the text is centered)
|
respectively, but padding both sides (i.e. the text is centered)
|
||||||
- %(trailers): display the trailers of the body as interpreted by
|
- %(trailers[:options]): display the trailers of the body as interpreted
|
||||||
linkgit:git-interpret-trailers[1]. If the `:only` option is given,
|
by linkgit:git-interpret-trailers[1]. The `trailers` string may be
|
||||||
omit non-trailer lines from the trailer block. If the `:unfold`
|
followed by a colon and zero or more comma-separated options. If the
|
||||||
option is given, behave as if interpret-trailer's `--unfold` option
|
`only` option is given, omit non-trailer lines from the trailer block.
|
||||||
was given. E.g., `%(trailers:only:unfold)` to do both.
|
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
|
NOTE: Some placeholders may depend on other options given to the
|
||||||
revision traversal engine. For example, the `%g*` reflog options will
|
revision traversal engine. For example, the `%g*` reflog options will
|
||||||
|
Loading…
Reference in New Issue
Block a user