| commit | 9c85a1c29c5ac26c94aa6eda8da9bbfbc6751785 | |
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | |
| Thu, 3 May 2018 23:01:28 +0000 (4 01:01 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 6 May 2018 04:21:58 +0000 (6 13:21 +0900) | ||
| tree | b3ae3b2c5961e13d4ec7c804f14ad29e1993aa0d | treesnapshot (tar.gz zip) |
| parent | ebddf393964120628f60f6f5e435cde87cc209c6 | commitdiff |
rebase --rebase-merges: a "merge" into a new root is a fast-forward
When a user provides a todo list containing something like
reset [new root]
merge my-branch
let's do the same as if pulling into an orphan branch: simply
fast-forward.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
When a user provides a todo list containing something like
reset [new root]
merge my-branch
let's do the same as if pulling into an orphan branch: simply
fast-forward.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| sequencer.c | diffblobblamehistory | |
| t/t3430-rebase-merges.sh | diffblobblamehistory |