]> git.ipfire.org Git - thirdparty/git.git/commit
Documentation/git-rebase.txt: -f forces a rebase that would otherwise be a no-op
authorSergey Organov <sorganov@gmail.com>
Mon, 11 Aug 2014 20:22:48 +0000 (00:22 +0400)
committerJunio C Hamano <gitster@pobox.com>
Tue, 12 Aug 2014 20:37:45 +0000 (13:37 -0700)
commit2d26d533a012f7475e13657d7fc829a6ba01db73
treee7f53fced3ae1a7306bb5bc0ff840cdce24eabef
parent32f56600bb6ac6fc57183e79d2c1515dfa56672f
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>
Documentation/git-rebase.txt