"Johannes Schindelin via GitGitGadget" <gitgitgadget@xxxxxxxxx> writes: > This patch fixes that. > > Note: while this patch targets pk/rebase-in-c-6-final, it will not work > correctly without ag/rebase-i-in-c. So my suggestion is to rewrite the > pk/rebas-in-c-6-final branch by first merging ag/rebase-i-in-c, then > applying this here patch, and only then cherry-pick "rebase: default to > using the builtin rebase". Yup, that sounds like a very sensible structure.