Merge branch 'js/rebase-in-c-5.5-work-with-rebase-i-in-c'
authorJunio C Hamano <gitster@pobox.com>
Fri, 2 Nov 2018 02:04:56 +0000 (11:04 +0900)
committerJunio C Hamano <gitster@pobox.com>
Fri, 2 Nov 2018 02:04:56 +0000 (11:04 +0900)
commit4b3517ee9d67c3f53147f66f1041c61ab760836c
tree3eb39116ed85e0b726eaee7963100eeabe50397f
parentfd1a9e903fd2d1bcf49723c282f75c83908484f9
parentbc24382c2b300a1ba135985b6376b32f8ea8f836
Merge branch 'js/rebase-in-c-5.5-work-with-rebase-i-in-c'

"rebase" that has been rewritten learns the new calling convention
used by "rebase -i" that was rewritten in C, tying the loose end
between two GSoC topics that stomped on each other's toes.

* js/rebase-in-c-5.5-work-with-rebase-i-in-c:
  builtin rebase: prepare for builtin rebase -i
builtin/rebase.c