diff options
author | Junio C Hamano <junio@hera.kernel.org> | 2009-03-19 17:47:52 +0000 |
---|---|---|
committer | Junio C Hamano <junio@hera.kernel.org> | 2009-03-19 17:47:52 +0000 |
commit | a973f1cb10e5189f7dc9fb2c554e13a9ed9347e8 (patch) | |
tree | 26f37b071c9caac9cf7a6bc84595821434414c68 /git-rebase.html | |
parent | d257cff3f36bed19f10bf4ede322157681256e9d (diff) | |
download | git-htmldocs-a973f1cb10e5189f7dc9fb2c554e13a9ed9347e8.tar.gz |
Autogenerated HTML docs for v1.6.2.1-222-g570cc
Diffstat (limited to 'git-rebase.html')
-rw-r--r-- | git-rebase.html | 28 |
1 files changed, 27 insertions, 1 deletions
diff --git a/git-rebase.html b/git-rebase.html index 7c8a3eb8d..03d634706 100644 --- a/git-rebase.html +++ b/git-rebase.html @@ -634,6 +634,20 @@ rebase.stat </p>
</dd>
<dt>
+-f
+</dt>
+<dt>
+--force-rebase
+</dt>
+<dd>
+<p>
+ Force the rebase even if the current branch is a descendant
+ of the commit you are rebasing onto. Normally the command will
+ exit with the message "Current branch is up to date" in such a
+ situation.
+</p>
+</dd>
+<dt>
--whitespace=<option>
</dt>
<dd>
@@ -644,6 +658,18 @@ rebase.stat </p>
</dd>
<dt>
+--committer-date-is-author-date
+</dt>
+<dt>
+--ignore-date
+</dt>
+<dd>
+<p>
+ These flags are passed to <em>git-am</em> to easily change the dates
+ of the rebased commits (see <a href="git-am.html">git-am(1)</a>).
+</p>
+</dd>
+<dt>
-i
</dt>
<dt>
@@ -1091,7 +1117,7 @@ Johannes E. Schindelin <johannes.schindelin@gmx.de></p></div> </div>
<div id="footer">
<div id="footer-text">
-Last updated 2009-03-11 23:56:01 UTC
+Last updated 2009-03-19 17:47:41 UTC
</div>
</div>
</body>
|