summaryrefslogtreecommitdiffstats
path: root/git-show.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-06-27 11:05:05 -0700
committerJunio C Hamano <gitster@pobox.com>2016-06-27 11:05:05 -0700
commit042f2148898f2f73342c586887b252715dd8af8a (patch)
tree186d91f728919ef22f36d69ad4f555e3cb5277ff /git-show.html
parentfedb1b428f68e8626c38f0aef57a8379e58f3241 (diff)
downloadgit-htmldocs-042f2148898f2f73342c586887b252715dd8af8a.tar.gz
Autogenerated HTML docs for v2.9.0-137-gcf4c2
Diffstat (limited to 'git-show.html')
-rw-r--r--git-show.html6
1 files changed, 3 insertions, 3 deletions
diff --git a/git-show.html b/git-show.html
index b68ae7b79..4b5a1f6cb 100644
--- a/git-show.html
+++ b/git-show.html
@@ -823,7 +823,7 @@ people using 80-column terminals.</p></div>
<p>
Show the full 40-byte hexadecimal commit object name. This negates
<code>--abbrev-commit</code> and those options which imply it such as
- "--oneline". It also overrides the <em>log.abbrevCommit</em> variable.
+ "--oneline". It also overrides the <code>log.abbrevCommit</code> variable.
</p>
</dd>
<dt class="hdlist1">
@@ -884,7 +884,7 @@ and <em>fuller</em>).</p></div>
on the command line.
</p>
<div class="paragraph"><p>By default, the notes shown are from the notes refs listed in the
-<em>core.notesRef</em> and <em>notes.displayRef</em> variables (or corresponding
+<code>core.notesRef</code> and <code>notes.displayRef</code> variables (or corresponding
environment overrides). See <a href="git-config.html">git-config(1)</a> for more details.</p></div>
<div class="paragraph"><p>With an optional <em>&lt;treeish&gt;</em> argument, use the treeish to find the notes
to display. The treeish can specify the full refname when it begins
@@ -2358,7 +2358,7 @@ with a <em>-p</em> option, "git diff" without the <em>--raw</em> option, or
"git log" with the "-p" option, they
do not produce the output described above; instead they produce a
patch file. You can customize the creation of such patches via the
-GIT_EXTERNAL_DIFF and the GIT_DIFF_OPTS environment variables.</p></div>
+<code>GIT_EXTERNAL_DIFF</code> and the <code>GIT_DIFF_OPTS</code> environment variables.</p></div>
<div class="paragraph"><p>What the -p option produces is slightly different from the traditional
diff format:</p></div>
<div class="olist arabic"><ol class="arabic">