diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2007-09-02 06:25:16 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2007-09-02 06:25:16 +0000 |
| commit | c5653d7925386e4ffaf82750f0bae29b20145649 (patch) | |
| tree | 70b8105fa17f3c5f0b741cff507b8f4b7e15495f /git-rebase.html | |
| parent | dbb64591ddf30b577662e7021a39b24b3fac6177 (diff) | |
| download | git-htmldocs-c5653d7925386e4ffaf82750f0bae29b20145649.tar.gz | |
Autogenerated HTML docs for v1.5.3
Diffstat (limited to 'git-rebase.html')
| -rw-r--r-- | git-rebase.html | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/git-rebase.html b/git-rebase.html index 515396b71..1599bd5a1 100644 --- a/git-rebase.html +++ b/git-rebase.html @@ -273,7 +273,7 @@ git-rebase(1) Manual Page <h2>SYNOPSIS</h2>
<div class="sectionbody">
<div class="verseblock">
-<div class="content"><em>git-rebase</em> [-i | --interactive] [-v | --verbose] [--merge] [-C<n>]
+<div class="content"><em>git-rebase</em> [-i | --interactive] [-v | --verbose] [-m | --merge] [-C<n>]
[-p | --preserve-merges] [--onto <newbase>] <upstream> [<branch>]
<em>git-rebase</em> --continue | --skip | --abort</div></div>
</div>
@@ -469,7 +469,7 @@ desired resolution, you can continue the rebasing process with</p> </p>
</dd>
<dt>
---merge
+-m, --merge
</dt>
<dd>
<p>
@@ -800,7 +800,7 @@ Johannes E. Schindelin <johannes.schindelin@gmx.de></p> </div>
<div id="footer">
<div id="footer-text">
-Last updated 01-Sep-2007 11:16:26 UTC
+Last updated 02-Sep-2007 06:24:43 UTC
</div>
</div>
</body>
|