diff options
author | Junio C Hamano <gitster@pobox.com> | 2023-01-30 14:48:08 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2023-01-30 14:48:08 -0800 |
commit | 11f1df190fcc3ac9c3263a3eba8104cbdee4787d (patch) | |
tree | d502d6143db9bbb16ca8afac629ff1b4126c9482 /git.html | |
parent | d71eb7dd5b4fb3cafaa3d603f625c0a0f75373f4 (diff) | |
download | git-htmldocs-11f1df190fcc3ac9c3263a3eba8104cbdee4787d.tar.gz |
Autogenerated HTML docs for v2.39.1-388-g2fc9e
Diffstat (limited to 'git.html')
-rw-r--r-- | git.html | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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 — 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, <path>.</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 <<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>
|