From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 8 Mar 2018 20:36:29 +0000 (-0800)
Subject: Merge branch 'mk/doc-pretty-fill'
X-Git-Tag: v2.17.0-rc0~23
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/cd3d56a9624f4e52cfefbf11593d08e0ce8e9133

Merge branch 'mk/doc-pretty-fill'

Docfix.

* mk/doc-pretty-fill:
docs/pretty-formats: fix typo '% <(<N>)' -> '%<|(<N>)'
---

cd3d56a9624f4e52cfefbf11593d08e0ce8e9133
diff --cc Documentation/pretty-formats.txt
index e664c088a5,00f86664b0..6109ef09aa
--- a/Documentation/pretty-formats.txt
+++ b/Documentation/pretty-formats.txt
@@@ -202,15 -191,8 +202,15 @@@ endif::git-rev-list[
  - '%>>(<N>)', '%>>|(<N>)': similar to '%>(<N>)', '%>|(<N>)'
    respectively, except that if the next placeholder takes more 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)
 +- %(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