diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2008-06-13 10:04:01 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2008-06-13 10:04:01 +0000 |
| commit | 6fb124cd538ba3d8d7c5da9bb979b3fd0e1b2925 (patch) | |
| tree | 42399be6b1d4ba93c664dd7a38942975da9d06f7 /git-pull.html | |
| parent | dc8f25ba925d69ae6cd9477948a4681a6b9ba881 (diff) | |
| download | git-htmldocs-6fb124cd538ba3d8d7c5da9bb979b3fd0e1b2925.tar.gz | |
Autogenerated HTML docs for v1.5.6-rc2-45-gdc92c
Diffstat (limited to 'git-pull.html')
| -rw-r--r-- | git-pull.html | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/git-pull.html b/git-pull.html index 77107a4a3..8b9e1ec17 100644 --- a/git-pull.html +++ b/git-pull.html @@ -429,10 +429,17 @@ when merging local branches into the current branch.</p> for branch <tt><name></tt>, set configuration <tt>branch.<name>.rebase</tt>
to <tt>true</tt>.
</p>
-<p><strong>NOTE:</strong> This is a potentially _dangerous_ mode of operation.
+<div class="admonitionblock">
+<table><tr>
+<td class="icon">
+<div class="title">Note</div>
+</td>
+<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.</p>
+unless you have read <a href="git-rebase.html">git-rebase(1)</a> carefully.</td>
+</tr></table>
+</div>
</dd>
<dt>
--no-rebase
@@ -1095,7 +1102,7 @@ Junio C Hamano and the git-list <git@vger.kernel.org>.</p> </div>
<div id="footer">
<div id="footer-text">
-Last updated 08-Jun-2008 22:46:54 UTC
+Last updated 13-Jun-2008 10:02:42 UTC
</div>
</div>
</body>
|