diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-10-26 15:24:37 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-10-26 15:24:37 -0700 |
| commit | 4a401d5d92702e0028f6a84625d0cac6218502f6 (patch) | |
| tree | 2a4cfb0e8efa777e3084bcb796850963b2f8a6c8 /git-show.html | |
| parent | c0859f7292882e15477dfc88025e14ce83a625db (diff) | |
| download | git-htmldocs-4a401d5d92702e0028f6a84625d0cac6218502f6.tar.gz | |
Autogenerated HTML docs for v2.10.1-613-g2cc2e
Diffstat (limited to 'git-show.html')
| -rw-r--r-- | git-show.html | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/git-show.html b/git-show.html index b89196f74..6c5cdaad1 100644 --- a/git-show.html +++ b/git-show.html @@ -1261,8 +1261,14 @@ The title was >>t4119: test autocomputing -p<n> for traditional diff </li>
<li>
<p>
-<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
+<em>%G?</em>: 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
</p>
</li>
<li>
@@ -1960,6 +1966,8 @@ override configuration settings.</p></div> lines are highlighted. E.g. <code>--ws-error-highlight=new,old</code>
highlights whitespace errors on both deleted and added lines.
<code>all</code> can be used as a short-hand for <code>old,new,context</code>.
+ The <code>diff.wsErrorHighlight</code> configuration variable can be
+ used to specify the default behaviour.
</p>
</dd>
<dt class="hdlist1">
|