summaryrefslogtreecommitdiffstats
path: root/git-rebase.html
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2008-03-03 02:01:16 +0000
committerJunio C Hamano <junio@hera.kernel.org>2008-03-03 02:01:16 +0000
commit4f1d8c48d0527535cace5f7f7b25e546a7ba7dab (patch)
tree1770764183352dbfe1003de1f6bfb304db4a55cb /git-rebase.html
parent69a98586dace45994f1eeeee63cf19d056bfc561 (diff)
downloadgit-htmldocs-4f1d8c48d0527535cace5f7f7b25e546a7ba7dab.tar.gz
Autogenerated HTML docs for v1.5.4.3-422-g34cd6
Diffstat (limited to 'git-rebase.html')
-rw-r--r--git-rebase.html3
1 files changed, 2 insertions, 1 deletions
diff --git a/git-rebase.html b/git-rebase.html
index d0cc962e9..bdc1516cf 100644
--- a/git-rebase.html
+++ b/git-rebase.html
@@ -274,6 +274,7 @@ git-rebase(1) Manual Page
<div class="sectionbody">
<div class="verseblock">
<div class="content"><em>git-rebase</em> [-i | --interactive] [-v | --verbose] [-m | --merge]
+ [-s &lt;strategy&gt; | --strategy=&lt;strategy&gt;]
[-C&lt;n&gt;] [ --whitespace=&lt;option&gt;] [-p | --preserve-merges]
[--onto &lt;newbase&gt;] &lt;upstream&gt; [&lt;branch&gt;]
<em>git-rebase</em> --continue | --skip | --abort</div></div>
@@ -831,7 +832,7 @@ Johannes E. Schindelin &lt;johannes.schindelin@gmx.de&gt;</p>
</div>
<div id="footer">
<div id="footer-text">
-Last updated 07-Jan-2008 07:50:39 UTC
+Last updated 03-Mar-2008 01:59:59 UTC
</div>
</div>
</body>