From: Michele Ballabio <barra_cuda@katamail.com>
Date: Wed, 18 Mar 2009 20:53:39 +0000 (+0100)
Subject: document --force-rebase
X-Git-Tag: v1.6.3-rc0~132
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=5e75d56f1182c99364c9f5375665c814985f384d;p=git.git

document --force-rebase

Signed-off-by: Michele Ballabio <barra_cuda@katamail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index 57bd333f0..276f1510c 100644
--- 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.