document --force-rebase

Signed-off-by: Michele Ballabio <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
bhenderson · Mar 19, 2009 · 5e75d56 · 5e75d56
1 parent b130a72
commit 5e75d56
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
@@ -258,6 +258,13 @@ OPTIONS
 	context exist they all must match.  By default no context is
 	ever ignored.
 
+-f::
+--force-rebase::
+	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.
+
 --whitespace=<option>::
 	This flag is passed to the 'git-apply' program
 	(see linkgit:git-apply[1]) that applies the patch.