Skip to content

Commit 2d26d53

Browse files
sorganovgitster
authored andcommitted
Documentation/git-rebase.txt: -f forces a rebase that would otherwise be a no-op
"Current branch is a descendant of the commit you are rebasing onto" does not necessarily mean "rebase" requires "--force". For a plain vanilla "history flattening" rebase, the rebase can be done without forcing if there is a merge between the tip of the branch being rebased and the commit you are rebasing onto, even if the tip is descendant of the other. [jc: reworded both the text and the log description] Signed-off-by: Sergey Organov <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 32f5660 commit 2d26d53

File tree

1 file changed

+2
-5
lines changed

1 file changed

+2
-5
lines changed

Documentation/git-rebase.txt

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -316,11 +316,8 @@ which makes little sense.
316316

317317
-f::
318318
--force-rebase::
319-
Force the rebase even if the current branch is a descendant
320-
of the commit you are rebasing onto. Normally non-interactive rebase will
321-
exit with the message "Current branch is up to date" in such a
322-
situation.
323-
Incompatible with the --interactive option.
319+
Force a rebase even if the current branch is up-to-date and
320+
the command without `--force` would return without doing anything.
324321
+
325322
You may find this (or --no-ff with an interactive rebase) helpful after
326323
reverting a topic branch merge, as this option recreates the topic branch with

0 commit comments

Comments
 (0)