diff options
| author |  Johannes Schindelin <johannes.schindelin@gmx.de> | 2018-05-04 01:01:28 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-05-06 13:21:58 +0900 |
| commit | 9c85a1c29c5ac26c94aa6eda8da9bbfbc6751785 (patch) | |
| tree | b3ae3b2c5961e13d4ec7c804f14ad29e1993aa0d /t/t2000-checkout-cache-clash.sh | |
| parent | sequencer: allow introducing new root commits (diff) | |
| download | tgif-9c85a1c29c5ac26c94aa6eda8da9bbfbc6751785.tar.xz | |
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>
Diffstat (limited to 't/t2000-checkout-cache-clash.sh')
0 files changed, 0 insertions, 0 deletions