From: Michele Ballabio Date: Thu, 19 Mar 2009 15:28:47 GMT Subject: [PATCH v3 2/3] document --force-rebase Message-ID: <1237476528-6040-1-git-send-email-barra_cuda@katamail.com> In-Reply-To: Words by Junio. Signed-off-by: Michele Ballabio --- On Thursday 19 March 2009, Sverre Rabbelier wrote: > Awesome, thanks! Perhaps you could, for extra brownie points, add a > line to the --whitespace=fix documentation that it implies > --force-rebase? You're right, I resent 3/3 for the same reason. Documentation/git-rebase.txt | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index 57bd333..7ffeec8 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@ -258,10 +258,19 @@ 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=