summaryrefslogtreecommitdiffstats
path: root/git-pull.html
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2009-11-15 10:02:56 +0000
committerJunio C Hamano <junio@hera.kernel.org>2009-11-15 10:02:56 +0000
commite1b2683fe5d6d67aa52277a7a90966c3cec6ef93 (patch)
treea8daa09b76e908903adf7e40a61774563f24da72 /git-pull.html
parent0ecfa0f3ad17b8a498a5c93dc403de943888e1b8 (diff)
downloadgit-htmldocs-e1b2683fe5d6d67aa52277a7a90966c3cec6ef93.tar.gz
Autogenerated HTML docs for v1.6.5.2-185-gb7fba
Diffstat (limited to 'git-pull.html')
-rw-r--r--git-pull.html4
1 files changed, 2 insertions, 2 deletions
diff --git a/git-pull.html b/git-pull.html
index 69d27d1a6..500f6812f 100644
--- a/git-pull.html
+++ b/git-pull.html
@@ -497,7 +497,7 @@ option can be used to override --squash.</p></div>
<td class="icon">
<div class="title">Note</div>
</td>
-<td class="content">This is a potentially <em>dangerous</em> mode of operation.
+<td class="content">This is a potentially _dangerous_ mode of operation.
It rewrites history, which does not bode well when you
published that history already. Do <strong>not</strong> use this option
unless you have read <a href="git-rebase.html">git-rebase(1)</a> carefully.</td>
@@ -1121,7 +1121,7 @@ Junio C Hamano and the git-list &lt;git@vger.kernel.org&gt;.</p></div>
</div>
<div id="footer">
<div id="footer-text">
-Last updated 2009-11-10 22:01:54 UTC
+Last updated 2009-11-15 09:57:15 UTC
</div>
</div>
</body>