diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2008-09-19 06:37:10 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2008-09-19 06:37:10 +0000 |
| commit | 4604fe5609a48fc240d1a88a15c642c9883363c7 (patch) | |
| tree | 846c5b418d438e9580d0a7702be832f1d1d9874c /git-read-tree.html | |
| parent | 5e4d8dee8bb242deb8fd16e7dcd74a0e7fb713d2 (diff) | |
| download | git-htmldocs-4604fe5609a48fc240d1a88a15c642c9883363c7.tar.gz | |
Autogenerated HTML docs for v1.6.0.2-287-g3791f
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 5582b864f..e709f3992 100644 --- a/git-read-tree.html +++ b/git-read-tree.html @@ -664,7 +664,7 @@ if a file exists in identical format in all three trees, it will </li>
<li>
<p>
-a file that has <em>any</em> difference what-so-ever in the three trees
+a file that has _any_ difference what-so-ever in the three trees
will stay as separate entries in the index. It's up to "porcelain
policy" to determine how to remove the non-0 stages, and insert a
merged version.
@@ -776,7 +776,7 @@ have finished your work-in-progress), attempt the merge again.</p></div> </div>
<div id="footer">
<div id="footer-text">
-Last updated 2008-09-16 19:17:16 UTC
+Last updated 2008-09-19 06:33:07 UTC
</div>
</div>
</body>
|