kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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 <sorganov@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Sergey Organov 2014-08-12 00:22:48 +04:00 committed by Junio C Hamano
parent 32f56600bb
commit 2d26d533a0
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Documentation/git-rebase.txt
View File

@ -316,11 +316,8 @@ which makes little sense.


-f:: -f::
--force-rebase:: --force-rebase::
Force the rebase even if the current branch is a descendant Force a rebase even if the current branch is up-to-date and
of the commit you are rebasing onto. Normally non-interactive rebase will the command without `--force` would return without doing anything.
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 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 reverting a topic branch merge, as this option recreates the topic branch with