summaryrefslogtreecommitdiffstats
path: root/git.html
diff options
context:
space:
mode:
Diffstat (limited to 'git.html')
-rw-r--r--git.html4
1 files changed, 2 insertions, 2 deletions
diff --git a/git.html b/git.html
index bbf7a3ae4..fd4808348 100644
--- a/git.html
+++ b/git.html
@@ -3121,7 +3121,7 @@ are the octal representation of the file modes.
(e.g. <code>new-file</code> in "git-diff-files"), <code>/dev/null</code> (e.g. <code>old-file</code>
when a new file is added), or a temporary file (e.g. <code>old-file</code> in the
index). <code>GIT_EXTERNAL_DIFF</code> should not worry about unlinking the
-temporary file --- it is removed when <code>GIT_EXTERNAL_DIFF</code> exits.</p></div>
+temporary file&#8201;&#8212;&#8201;it is removed when <code>GIT_EXTERNAL_DIFF</code> exits.</p></div>
<div class="paragraph"><p>For a path that is unmerged, <code>GIT_EXTERNAL_DIFF</code> is called with 1
parameter, &lt;path&gt;.</p></div>
<div class="paragraph"><p>For each path <code>GIT_EXTERNAL_DIFF</code> is called, two environment variables,
@@ -3796,7 +3796,7 @@ the Git Security mailing list &lt;<a href="mailto:git-security@googlegroups.com"
<div id="footer">
<div id="footer-text">
Last updated
- 2023-01-04 22:32:44 PST
+ 2023-01-30 14:44:53 PST
</div>
</div>
</body>