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-checkout.html | |
| parent | 5e4d8dee8bb242deb8fd16e7dcd74a0e7fb713d2 (diff) | |
| download | git-htmldocs-4604fe5609a48fc240d1a88a15c642c9883363c7.tar.gz | |
Autogenerated HTML docs for v1.6.0.2-287-g3791f
Diffstat (limited to 'git-checkout.html')
| -rw-r--r-- | git-checkout.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-checkout.html b/git-checkout.html index 68dcbc191..a4373ba43 100644 --- a/git-checkout.html +++ b/git-checkout.html @@ -560,7 +560,7 @@ three-way merge:</p></div> <pre><tt>$ git checkout -m mytopic
Auto-merging frotz</tt></pre>
</div></div>
-<div class="para"><p>After this three-way merge, the local modifications are <em>not</em>
+<div class="para"><p>After this three-way merge, the local modifications are _not_
registered in your index file, so <tt>git diff</tt> would show you what
changes you made since the tip of the new branch.</p></div>
</li>
@@ -603,7 +603,7 @@ $ git add frotz</tt></pre> </div>
<div id="footer">
<div id="footer-text">
-Last updated 2008-08-24 03:33:55 UTC
+Last updated 2008-09-19 06:32:44 UTC
</div>
</div>
</body>
|