Previous description of -f option was wrong as "git rebase" does not
require -f to perform rebase when "current branch is a descendant of
the commit you are rebasing onto", provided commit(s) to be rebased
contain merge(s).
Signed-off-by: Sergey Organov <sorga...@gmail.com>
---
Documentation/git-rebase.txt | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index 2a93c64..62dac31 100644
--- a/Documentation/git-rebase.txt
+++ b/Documentation/git-rebase.txt
@@ -316,10 +316,9 @@ which makes little sense.
-f::
--force-rebase::
- Force the rebase even if the current branch is a descendant
- of the commit you are rebasing onto. Normally non-interactive rebase
will
- exit with the message "Current branch is up to date" in such a
- situation.
+ Force the rebase even if the result will only change commit
+ timestamps. Normally non-interactive rebase will exit with the
+ message "Current branch is up to date" in such a situation.
Incompatible with the --interactive option.
+
You may find this (or --no-ff with an interactive rebase) helpful after
--
1.9.3
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
