Use the `--merge` backend when rebasing
In the following discussion:
https://public-inbox.org/git/nycvar.QRO.7.76.6.1904171754060.46@tvgsbejvaqbjf.bet/
Johannes Schindelin says:
"... we recently changed the way the --merge backend works, and it is now indeed backed by the same machinery as the interactive rebase."
and
"... Elijah Newren (who authored that change) then demonstrated
that in most cases, the --merge
backend is actually faster than the
default (--am
) backend."
The --merge
backend is likely to become even faster soon as some patch series are going to be merged soon and will make this backend even faster as discussed here:
https://public-inbox.org/git/adb4a578-9bc6-f017-5817-cd045dcb0a32@gmail.com/
(The ag/sequencer-reduce-rewriting-todo patch series, which I think should improve things a lot, should be merged into master soon and pw/rebase-i-internal-rfc might be merged in Git v2.22.0 too.)
If we use some options that are not available in the merge backend, then maybe a Google Summer of Code student will add them soon:
https://public-inbox.org/git/20190405213100.9577-1-rohit.ashiwal265@gmail.com/
Otherwise this should be easy to do, we just need to pass --merge
to the rebase command.
cc @zj