diff options
| author |  Johannes Schindelin <johannes.schindelin@gmx.de> | 2017-01-02 16:28:30 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2017-01-09 14:57:30 -0800 |
| commit | ca6c6b45dd9c36ae3e0b4f1fc9812d1e6a8b59bc (patch) | |
| tree | 0447684f39cf88b936200ef47f80e89cffdc2a62 /tree-diff.c | |
| parent | sequencer (rebase -i): respect the rebase.autostash setting (diff) | |
| download | tgif-ca6c6b45dd9c36ae3e0b4f1fc9812d1e6a8b59bc.tar.xz | |
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>
Diffstat (limited to 'tree-diff.c')
0 files changed, 0 insertions, 0 deletions