summaryrefslogtreecommitdiff
path: root/Documentation/RelNotes/1.5.3.1.txt
diff options
context:
space:
mode:
authorLibravatar Sergey Organov <sorganov@gmail.com>2014-08-12 00:22:48 +0400
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-08-12 13:37:45 -0700
commit2d26d533a012f7475e13657d7fc829a6ba01db73 (patch)
treee7f53fced3ae1a7306bb5bc0ff840cdce24eabef /Documentation/RelNotes/1.5.3.1.txt
parentGit 2.0.4 (diff)
downloadtgif-2d26d533a012f7475e13657d7fc829a6ba01db73.tar.xz
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>
Diffstat (limited to 'Documentation/RelNotes/1.5.3.1.txt')
0 files changed, 0 insertions, 0 deletions