diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2008-10-10 15:31:42 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2008-10-10 15:31:42 +0000 |
| commit | a476efaaca349e01dfbc4e1009ab534aa511479b (patch) | |
| tree | b0f05e148f284deb9030edaf25419f9f704adb32 /git-read-tree.html | |
| parent | 7cc912979feaec3ed65d4491e129ed48507f6994 (diff) | |
| download | git-htmldocs-a476efaaca349e01dfbc4e1009ab534aa511479b.tar.gz | |
Autogenerated HTML docs for v1.6.0.2-514-g23abd3
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 e709f3992..f1add1818 100644 --- a/git-read-tree.html +++ b/git-read-tree.html @@ -597,7 +597,7 @@ merge, but it would not show in <tt>git diff-index --cached $M</tt> output after two-tree merge.</p></div>
<div class="para"><p>Case #3 is slightly tricky and needs explanation. The result from this
rule logically should be to remove the path if the user staged the removal
-of the path and then swiching to a new branch. That however will prevent
+of the path and then switching to a new branch. That however will prevent
the initial checkout from happening, so the rule is modified to use M (new
tree) only when the contents of the index is empty. Otherwise the removal
of the path is kept as long as $H and $M are the same.</p></div>
@@ -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-19 06:33:07 UTC
+Last updated 2008-10-10 15:30:49 UTC
</div>
</div>
</body>
|