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?hp=-c

Merge branch 'mk/doc-pretty-fill'

Docfix.

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

cd3d56a9624f4e52cfefbf11593d08e0ce8e9133
diff --combined Documentation/pretty-formats.txt
index e664c088a5,00f86664b0..6109ef09aa
--- a/Documentation/pretty-formats.txt
+++ b/Documentation/pretty-formats.txt
@@@ -143,14 -143,8 +143,14 @@@ ifndef::git-rev-list[
  - '%N': commit notes
  endif::git-rev-list[]
  - '%GG': raw verification message from GPG for a signed commit
 -- '%G?': show "G" for a good (valid) signature, "B" for a bad signature,
 -  "U" for a good signature with unknown validity and "N" for no signature
 +- '%G?': show "G" for a good (valid) signature,
 +  "B" for a bad signature,
 +  "U" for a good signature with unknown validity,
 +  "X" for a good signature that has expired,
 +  "Y" for a good signature made by an expired key,
 +  "R" for a good signature made by a revoked key,
 +  "E" if the signature cannot be checked (e.g. missing key)
 +  and "N" for no signature
  - '%GS': show the name of the signer for a signed commit
  - '%GK': show the key used to sign a signed commit
  - '%gD': reflog selector, e.g., `refs/stash@{1}` or
@@@ -173,17 -167,12 +173,17 @@@
  - '%Cblue': switch color to blue
  - '%Creset': reset color
  - '%C(...)': color specification, as described under Values in the
 -  "CONFIGURATION FILE" section of linkgit:git-config[1];
 -  adding `auto,` at the beginning will emit color only when colors are
 -  enabled for log output (by `color.diff`, `color.ui`, or `--color`, and
 -  respecting the `auto` settings of the former if we are going to a
 -  terminal). `auto` alone (i.e. `%C(auto)`) will turn on auto coloring
 -  on the next placeholders until the color is switched again.
 +  "CONFIGURATION FILE" section of linkgit:git-config[1].
 +  By default, colors are shown only when enabled for log output (by
 +  `color.diff`, `color.ui`, or `--color`, and respecting the `auto`
 +  settings of the former if we are going to a terminal). `%C(auto,...)`
 +  is accepted as a historical synonym for the default (e.g.,
 +  `%C(auto,red)`). Specifying `%C(always,...) will show the colors
 +  even when color is not otherwise enabled (though consider
 +  just using `--color=always` to enable color for the whole output,
 +  including this format and anything else git might color).  `auto`
 +  alone (i.e. `%C(auto)`) will turn on auto coloring on the next
 +  placeholders until the color is switched again.
  - '%m': left (`<`), right (`>`) or boundary (`-`) mark
  - '%n': newline
  - '%%': a raw '%'
@@@ -202,15 -191,8 +202,15 @@@
  - '%>>(<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
@@@ -223,8 -205,8 +223,8 @@@ If you add a `+` (plus sign) after '%' 
  is inserted immediately before the expansion if and only if the
  placeholder expands to a non-empty string.
  
 -If you add a `-` (minus sign) after '%' of a placeholder, line-feeds that
 -immediately precede the expansion are deleted if and only if the
 +If you add a `-` (minus sign) after '%' of a placeholder, all consecutive
 +line-feeds immediately preceding the expansion are deleted if and only if the
  placeholder expands to an empty string.
  
  If you add a ` ` (space) after '%' of a placeholder, a space