From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 9 Feb 2019 04:44:52 +0000 (-0800)
Subject: Merge branch 'kl/pretty-doc-markup-fix'
X-Git-Tag: v2.21.0-rc1~19
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/ca9103d15deebf875e8d563e0968ba2e95c19d35?ds=inline;hp=-c

Merge branch 'kl/pretty-doc-markup-fix'

Doc update.

* kl/pretty-doc-markup-fix:
doc: prevent overflowing <code> tag in rendered HTML
---

ca9103d15deebf875e8d563e0968ba2e95c19d35
diff --combined Documentation/pretty-formats.txt
index de6953108c,ee08d0906b..7bfffae765
--- a/Documentation/pretty-formats.txt
+++ b/Documentation/pretty-formats.txt
@@@ -134,8 -134,6 +134,8 @@@ The placeholders are
  - '%cI': committer date, strict ISO 8601 format
  - '%d': ref names, like the --decorate option of linkgit:git-log[1]
  - '%D': ref names without the " (", ")" wrapping.
 +- '%S': ref name given on the command line by which the commit was reached
 +  (like `git log --source`), only works with `git log`
  - '%e': encoding
  - '%s': subject
  - '%f': sanitized subject line, suitable for a filename
@@@ -183,7 -181,7 +183,7 @@@ endif::git-rev-list[
    `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
+   `%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`