Johannes Schindelin ece313bfe5 sequencer (rebase -i): respect strategy/strategy_opts settings ...

The sequencer already has an idea about using different merge
strategies. We just piggy-back on top of that, using rebase -i's
own settings, when running the sequencer in interactive rebase mode.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>

2017-02-01 16:16:32 +01:00

64 KiB

Raw Blame History

View Raw