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-pull.html | |
| parent | 5e4d8dee8bb242deb8fd16e7dcd74a0e7fb713d2 (diff) | |
| download | git-htmldocs-4604fe5609a48fc240d1a88a15c642c9883363c7.tar.gz | |
Autogenerated HTML docs for v1.6.0.2-287-g3791f
Diffstat (limited to 'git-pull.html')
| -rw-r--r-- | git-pull.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-pull.html b/git-pull.html index c5f610578..f9b20d952 100644 --- a/git-pull.html +++ b/git-pull.html @@ -482,7 +482,7 @@ when merging local branches into the current branch.</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>
@@ -1149,7 +1149,7 @@ Junio C Hamano and the git-list <git@vger.kernel.org>.</p></div> </div>
<div id="footer">
<div id="footer-text">
-Last updated 2008-08-10 03:55:19 UTC
+Last updated 2008-09-19 06:33:06 UTC
</div>
</div>
</body>
|