diff options
Diffstat (limited to 'git-read-tree.html')
| -rw-r--r-- | git-read-tree.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-read-tree.html b/git-read-tree.html index 3d0e35d03..716b1d4e4 100644 --- a/git-read-tree.html +++ b/git-read-tree.html @@ -1056,7 +1056,7 @@ see which of the "local changes" that you made were carried forward by running <code>git diff-index --cached $M</code>. Note that this does not
necessarily match what <code>git diff-index --cached $H</code> would have
produced before such a two tree merge. This is because of cases
-18 and 19 --- if you already had the changes in $M (e.g. maybe
+18 and 19 — if you already had the changes in $M (e.g. maybe
you picked it up via e-mail in a patch form), <code>git diff-index
--cached $H</code> would have told you about the change before this
merge, but it would not show in <code>git diff-index --cached $M</code>
@@ -1294,7 +1294,7 @@ support.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2022-10-28 11:53:56 PDT
+ 2023-01-30 14:44:53 PST
</div>
</div>
</body>
|