Autogenerated HTML docs for v2.1.0-127-g0c72b

1 files changed, 3 insertions, 6 deletions

diff --git a/git-rebase.html b/git-rebase.html
index 92d9754ce..81419f144 100644
--- a/git-rebase.html
+++ b/git-rebase.html
@@ -1177,11 +1177,8 @@ which makes little sense.</p></div>
 </dt>

 <dd>

 <p>

-        Force the rebase even if the current branch is a descendant

-        of the commit you are rebasing onto.  Normally non-interactive rebase will

-        exit with the message "Current branch is up to date" in such a

-        situation.

-        Incompatible with the --interactive option.

+        Force a rebase even if the current branch is up-to-date and

+        the command without <tt>--force</tt> would return without doing anything.

 </p>

 <div class="paragraph"><p>You may find this (or --no-ff with an interactive rebase) helpful after

 reverting a topic branch merge, as this option recreates the topic branch with

@@ -1972,7 +1969,7 @@ reorder commits tend to produce counterintuitive results.</p></div>
 <div id="footnotes"><hr /></div>

 <div id="footer">

 <div id="footer-text">

-Last updated 2014-02-27 15:06:29 PST

+Last updated 2014-09-09 14:15:21 PDT

 </div>

 </div>

 </body>