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?hp=19116cd00ef826ca41eab56197b16350c4900c1e

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

Doc update.

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

diff --git a/Documentation/pretty-formats.txt b/Documentation/pretty-formats.txt
index de6953108c..7bfffae765 100644
--- a/Documentation/pretty-formats.txt
+++ b/Documentation/pretty-formats.txt
@@ -183,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`