diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-11-18 18:23:59 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-11-18 18:23:59 +0900 |
| commit | 4520c233742cca267e1c0ba55f04f35ef7e9baf7 (patch) | |
| tree | c492d0450700e918465d75e01e924d18f9327b2a /tree-diff.c | |
| parent | Merge branch 'js/rebase-am-options' (diff) | |
| parent | tests: add a special setup where rebase.useBuiltin is off (diff) | |
| download | git-4520c233742cca267e1c0ba55f04f35ef7e9baf7.tar.gz git-4520c233742cca267e1c0ba55f04f35ef7e9baf7.zip | |
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
Diffstat (limited to 'tree-diff.c')
0 files changed, 0 insertions, 0 deletions