subject:"\[PATCH v2 24\/34\] sequencer \(rebase \-i\)\: respect strategy\/strategy_opts settings"

Re: [PATCH v2 24/34] sequencer (rebase -i): respect strategy/strategy_opts settings

2016-12-19 Thread Junio C Hamano

Johannes Schindelin writes: > 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

[PATCH v2 24/34] sequencer (rebase -i): respect strategy/strategy_opts settings

2016-12-13 Thread Johannes Schindelin

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 --- sequencer.c | 26