From 5e75d56f1182c99364c9f5375665c814985f384d Mon Sep 17 00:00:00 2001 From: Michele Ballabio Date: Wed, 18 Mar 2009 21:53:39 +0100 Subject: [PATCH] document --force-rebase Signed-off-by: Michele Ballabio Signed-off-by: Junio C Hamano --- Documentation/git-rebase.txt | 7 +++++++ 1 file changed, 7 insertions(+) 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=