summaryrefslogtreecommitdiffstats
path: root/git-show.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2020-09-03 13:22:34 -0700
committerJunio C Hamano <gitster@pobox.com>2020-09-03 13:22:34 -0700
commit558abd28b6851f370edc902b483e079a3ac255ab (patch)
tree0b524b111b53d2a9487fb1c45b50dd7812965487 /git-show.html
parentcf8aeaf7e987e73615910d6961e38f20a8b0b550 (diff)
downloadgit-htmldocs-558abd28b6851f370edc902b483e079a3ac255ab.tar.gz
Autogenerated HTML docs for v2.28.0-450-g3a238
Diffstat (limited to 'git-show.html')
-rw-r--r--git-show.html7
1 files changed, 4 insertions, 3 deletions
diff --git a/git-show.html b/git-show.html
index c4d60276e..ea1256d92 100644
--- a/git-show.html
+++ b/git-show.html
@@ -823,8 +823,8 @@ people using 80-column terminals.</p></div>
<dd>
<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 <code>log.abbrevCommit</code> variable.
+ <code>--abbrev-commit</code>, either explicit or implied by other options such
+ as "--oneline". It also overrides the <code>log.abbrevCommit</code> variable.
</p>
</dd>
<dt class="hdlist1">
@@ -3109,7 +3109,8 @@ matches "<code>fooasdfbar</code>" and "<code>foo/bar/baz/asdf</code>" but not "<
<a href="git-diff-files.html">git-diff-files(1)</a>
with the <code>-p</code> option produces patch text.
You can customize the creation of patch text via the
-<code>GIT_EXTERNAL_DIFF</code> and the <code>GIT_DIFF_OPTS</code> environment variables.</p></div>
+<code>GIT_EXTERNAL_DIFF</code> and the <code>GIT_DIFF_OPTS</code> environment variables
+(see <a href="git.html">git(1)</a>).</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">