From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 2 Nov 2018 02:04:56 +0000 (+0900)
Subject: Merge branch 'js/rebase-in-c-5.5-work-with-rebase-i-in-c'
X-Git-Tag: v2.20.0-rc0~89
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/4b3517ee9d67c3f53147f66f1041c61ab760836c

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

4b3517ee9d67c3f53147f66f1041c61ab760836c