summaryrefslogtreecommitdiffstats
path: root/git-log.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-log.html
parentfedb1b428f68e8626c38f0aef57a8379e58f3241 (diff)
downloadgit-htmldocs-042f2148898f2f73342c586887b252715dd8af8a.tar.gz
Autogenerated HTML docs for v2.9.0-137-gcf4c2
Diffstat (limited to 'git-log.html')
-rw-r--r--git-log.html12
1 files changed, 6 insertions, 6 deletions
diff --git a/git-log.html b/git-log.html
index 4d60d6e9a..ec728ed3b 100644
--- a/git-log.html
+++ b/git-log.html
@@ -1871,7 +1871,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">
@@ -1932,7 +1932,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
@@ -3613,7 +3613,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">
@@ -4081,7 +4081,7 @@ notes.displayRef
<dd>
<p>
Which refs, in addition to the default set by <code>core.notesRef</code>
- or <em>GIT_NOTES_REF</em>, to read notes from when showing commit
+ or <code>GIT_NOTES_REF</code>, to read notes from when showing commit
messages with the <code>log</code> family of commands. See
<a href="git-notes.html">git-notes(1)</a>.
</p>
@@ -4089,7 +4089,7 @@ notes.displayRef
multiple times. A warning will be issued for refs that do not exist,
but a glob that does not match any refs is silently ignored.</p></div>
<div class="paragraph"><p>This setting can be disabled by the <code>--no-notes</code> option,
-overridden by the <em>GIT_NOTES_DISPLAY_REF</em> environment variable,
+overridden by the <code>GIT_NOTES_DISPLAY_REF</code> environment variable,
and overridden by the <code>--notes=&lt;ref&gt;</code> option.</p></div>
</dd>
</dl></div>
@@ -4105,7 +4105,7 @@ and overridden by the <code>--notes=&lt;ref&gt;</code> option.</p></div>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2016-05-29 18:21:50 PDT
+Last updated 2016-06-27 11:04:05 PDT
</div>
</div>
</body>