mirror of
https://github.com/git/git.git
synced 2024-05-13 09:56:09 +02:00
Merge branch 'bl/doc-key-val-sep-fix'
The documentation for "%(trailers[:options])" placeholder in the "--pretty" option of commands in the "git log" family has been updated. * bl/doc-key-val-sep-fix: docs: adjust trailer `separator` and `key_value_separator` language docs: correct trailer `key_value_separator` description
This commit is contained in:
commit
03658df781
|
@ -316,9 +316,8 @@ multiple times, the last occurrence wins.
|
||||||
`Reviewed-by`.
|
`Reviewed-by`.
|
||||||
** 'only[=<bool>]': select whether non-trailer lines from the trailer
|
** 'only[=<bool>]': select whether non-trailer lines from the trailer
|
||||||
block should be included.
|
block should be included.
|
||||||
** 'separator=<sep>': specify a separator inserted between trailer
|
** 'separator=<sep>': specify the separator inserted between trailer
|
||||||
lines. When this option is not given each trailer line is
|
lines. Defaults to a line feed character. The string <sep> may contain
|
||||||
terminated with a line feed character. The string <sep> may contain
|
|
||||||
the literal formatting codes described above. To use comma as
|
the literal formatting codes described above. To use comma as
|
||||||
separator one must use `%x2C` as it would otherwise be parsed as
|
separator one must use `%x2C` as it would otherwise be parsed as
|
||||||
next option. E.g., `%(trailers:key=Ticket,separator=%x2C )`
|
next option. E.g., `%(trailers:key=Ticket,separator=%x2C )`
|
||||||
|
@ -329,10 +328,9 @@ multiple times, the last occurrence wins.
|
||||||
`%(trailers:only,unfold=true)` unfolds and shows all trailer lines.
|
`%(trailers:only,unfold=true)` unfolds and shows all trailer lines.
|
||||||
** 'keyonly[=<bool>]': only show the key part of the trailer.
|
** 'keyonly[=<bool>]': only show the key part of the trailer.
|
||||||
** 'valueonly[=<bool>]': only show the value part of the trailer.
|
** 'valueonly[=<bool>]': only show the value part of the trailer.
|
||||||
** 'key_value_separator=<sep>': specify a separator inserted between
|
** 'key_value_separator=<sep>': specify the separator inserted between
|
||||||
trailer lines. When this option is not given each trailer key-value
|
the key and value of each trailer. Defaults to ": ". Otherwise it
|
||||||
pair is separated by ": ". Otherwise it shares the same semantics
|
shares the same semantics as 'separator=<sep>' above.
|
||||||
as 'separator=<sep>' above.
|
|
||||||
|
|
||||||
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