]> git.ipfire.org Git - thirdparty/git.git/commit - sequencer.c
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 796c797) | patch
sequencer (rebase -i): respect strategy/strategy_opts settings
authorJohannes Schindelin <johannes.schindelin@gmx.de>
Mon, 2 Jan 2017 15:28:30 +0000 (16:28 +0100)
committerJunio C Hamano <gitster@pobox.com>
Mon, 9 Jan 2017 22:57:30 +0000 (14:57 -0800)
commitca6c6b45dd9c36ae3e0b4f1fc9812d1e6a8b59bc
tree0447684f39cf88b936200ef47f80e89cffdc2a62tree | snapshot
parent796c7972c7236634655d2333333e9f871149b994commit | diff
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>
sequencer.c diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.