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)
"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

1  2 
builtin/rebase.c

Simple merge