| commit | ca6c6b45dd9c36ae3e0b4f1fc9812d1e6a8b59bc | |
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | |
| Mon, 2 Jan 2017 15:28:30 +0000 (2 16:28 +0100) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 9 Jan 2017 22:57:30 +0000 (9 14:57 -0800) | ||
| tree | 0447684f39cf88b936200ef47f80e89cffdc2a62 | treesnapshot (tar.gz zip) |
| parent | 796c7972c7236634655d2333333e9f871149b994 | commitdiff |
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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| sequencer.c | diffblobblamehistory |