Skip to content

Commit

Permalink
Documentation/git-rebase.txt: -f forces a rebase that would otherwise…
Browse files Browse the repository at this point in the history
… 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 <sorganov@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Sergey Organov authored and Junio C Hamano committed Aug 12, 2014
1 parent 32f5660 commit 2d26d53
Showing 1 changed file with 2 additions and 5 deletions.
7 changes: 2 additions & 5 deletions Documentation/git-rebase.txt
Original file line number Diff line number Diff line change
Expand Up @@ -316,11 +316,8 @@ 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.
Incompatible with the --interactive option.
Force a rebase even if the current branch is up-to-date and
the command without `--force` would return without doing anything.
+
You may find this (or --no-ff with an interactive rebase) helpful after
reverting a topic branch merge, as this option recreates the topic branch with
Expand Down

0 comments on commit 2d26d53

Please sign in to comment.