Merge branch 'js/sequencer-and-root-commits'
commitc5aa4bccb5ffcc01e45915c00d2fce30ce959dab
authorJunio C Hamano <gitster@pobox.com>
Wed, 30 May 2018 05:04:04 +0000 (30 14:04 +0900)
committerJunio C Hamano <gitster@pobox.com>
Wed, 30 May 2018 05:04:04 +0000 (30 14:04 +0900)
tree1416c16d013f318821cff23d71ea2dba6c866dbe
parent89be19d7080721dab5f07488b7987c66c8b8460c
parent8fa6eea0ffd271f0564048dc939987e9640efca5
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
sequencer.c
sequencer.h