Files
git/Documentation
Sergey Organov 2d26d533a0 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>
2014-08-12 13:37:45 -07:00
..
2014-03-31 15:16:22 -07:00
2014-07-30 14:19:53 -07:00
2009-04-06 00:27:09 -07:00
2014-04-08 12:00:28 -07:00
2013-07-22 16:06:48 -07:00
2013-02-14 10:29:01 -08:00
2013-09-04 12:23:25 -07:00
2013-09-09 14:50:36 -07:00
2013-12-17 11:46:32 -08:00
2013-10-23 13:21:31 -07:00
2014-04-08 12:00:28 -07:00
2011-09-06 11:42:12 -07:00
2013-05-29 14:23:04 -07:00
2013-10-18 13:50:12 -07:00
2011-03-11 10:59:16 -05:00
2014-02-27 14:04:05 -08:00
2013-04-12 12:00:52 -07:00
2014-07-30 14:19:53 -07:00
2014-02-07 11:55:12 -08:00