document --force-rebase
Signed-off-by: Michele Ballabio <barra_cuda@katamail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Michele Ballabio committed
Mar 18, 2009 at 21:53 UTC
5e75d56f1182c99364c9f5375665c814985f384d
1 file changed
+7
Documentation/git-rebase.txt
+7
@@ -258,6 +258,13 @@ OPTIONS
258
context exist they all must match. By default no context is
259
ever ignored.
260
261
+-f::
262
+--force-rebase::
263
+ Force the rebase even if the current branch is a descendant
264
+ of the commit you are rebasing onto. Normally the command will
265
+ exit with the message "Current branch is up to date" in such a
266
+ situation.
267
+
268
--whitespace=<option>::
269
This flag is passed to the 'git-apply' program
270
(see linkgit:git-apply[1]) that applies the patch.