From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 18 Nov 2018 09:23:59 +0000 (+0900)
Subject: Merge branch 'ab/rebase-in-c-escape-hatch'
X-Git-Tag: v2.20.0-rc0~2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/4520c233742cca267e1c0ba55f04f35ef7e9baf7

Merge branch 'ab/rebase-in-c-escape-hatch'

The recently merged "rebase in C" has an escape hatch to use the
scripted version when necessary, but it hasn't been documented,
which has been corrected.

* ab/rebase-in-c-escape-hatch:
tests: add a special setup where rebase.useBuiltin is off
rebase doc: document rebase.useBuiltin
---

4520c233742cca267e1c0ba55f04f35ef7e9baf7