Words by Junio. Signed-off-by: Michele Ballabio <barra_cuda@xxxxxxxxxxxx> --- 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=<option>:: This flag is passed to the 'git-apply' program (see linkgit:git-apply[1]) that applies the patch. Incompatible with the --interactive option. + If the option `fix` (or its equivalent `strip`) is used, it implies + --force-rebase. -i:: --interactive:: -- 1.6.2.22.gc2ac -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
