]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 137c1f2 62c2393)
Merge branch 'ab/rebase-in-c-escape-hatch'
authorJunio C Hamano <gitster@pobox.com>
Sun, 18 Nov 2018 09:23:59 +0000 (18:23 +0900)
committerJunio C Hamano <gitster@pobox.com>
Sun, 18 Nov 2018 09:23:59 +0000 (18:23 +0900)
commit4520c233742cca267e1c0ba55f04f35ef7e9baf7
treec492d0450700e918465d75e01e924d18f9327b2atree | snapshot
parent137c1f2f51bceb8d1f1f457c52129be78c0ac86dcommit | diff
parent62c23938fae5b7a374388c64fbdf8ee9ecb51b92commit | diff
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
builtin/rebase.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.