From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 30 May 2018 05:04:04 +0000 (+0900)
Subject: Merge branch 'js/sequencer-and-root-commits'
X-Git-Tag: v2.18.0-rc0~32
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/c5aa4bccb5ffcc01e45915c00d2fce30ce959dab?hp=c5aa4bccb5ffcc01e45915c00d2fce30ce959dab

Merge branch 'js/sequencer-and-root-commits'

The implementation of "git rebase -i --root" has been updated to use
the sequencer machinery more.

* js/sequencer-and-root-commits:
rebase --rebase-merges: root commits can be cousins, too
rebase --rebase-merges: a "merge" into a new root is a fast-forward
sequencer: allow introducing new root commits
rebase -i --root: let the sequencer handle even the initial part
sequencer: learn about the special "fake root commit" handling
sequencer: extract helper to update active_cache_tree
---