diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-05-17 15:27:24 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-05-17 15:27:24 -0700 |
| commit | 198b1f1fbb7b9bb186d3e7bc86f62813bccc396a (patch) | |
| tree | 78a3fb45dce6ca0bf5c13f3446ecc7b91e753036 /git-show.html | |
| parent | eda40534055629f4ae708ab5ab19c317d2161e42 (diff) | |
| download | git-htmldocs-198b1f1fbb7b9bb186d3e7bc86f62813bccc396a.tar.gz | |
Autogenerated HTML docs for v2.8.2-534-g1f669
Diffstat (limited to 'git-show.html')
| -rw-r--r-- | git-show.html | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/git-show.html b/git-show.html index 711f6926e..a4b042ace 100644 --- a/git-show.html +++ b/git-show.html @@ -1261,8 +1261,8 @@ The title was >>t4119: test autocomputing -p<n> for traditional diff </li>
<li>
<p>
-<em>%G?</em>: show "G" for a Good signature, "B" for a Bad signature, "U" for a good,
- untrusted signature and "N" for no signature
+<em>%G?</em>: 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
</p>
</li>
<li>
@@ -1882,7 +1882,7 @@ newline.</p></div> <div class="paragraph"><p>For example, <code>--word-diff-regex=.</code> will treat each character as a word
and, correspondingly, show differences character by character.</p></div>
<div class="paragraph"><p>The regex can also be set via a diff driver or configuration option, see
-<a href="gitattributes.html">gitattributes(1)</a> or <a href="git-config.html">git-config(1)</a>. Giving it explicitly
+<a href="gitattributes.html">gitattributes(5)</a> or <a href="git-config.html">git-config(1)</a>. Giving it explicitly
overrides any diff driver or configuration setting. Diff drivers
override configuration settings.</p></div>
</dd>
|