From: Phillip Wood <phillip.wood@xxxxxxxxxxxxx> Cleanup the handling of --strategy-option now that we no longer need to support "--preserve-merges" and properly quote the argument when saving it to disc. These patches are based on a merge of 'master' and 'ab/fix-strategy-opts-parsing' Published-As: https://github.com/phillipwood/git/releases/tag/sequencer-merge-strategy-options%2Fv1 View-Changes-At: https://github.com/phillipwood/git/compare/c2e329a52...3e02eeff7 Fetch-It-Via: git fetch https://github.com/phillipwood/git sequencer-merge-strategy-options/v1 Phillip Wood (4): rebase: stop reading and writing unnecessary strategy state rebase -m: cleanup --strategy-option handling rebase -m: fix serialization of strategy options rebase: remove a couple of redundant strategy tests builtin/rebase.c | 60 +++++++++----------------------- sequencer.c | 26 ++++++++++---- sequencer.h | 1 - t/t3402-rebase-merge.sh | 21 ------------ t/t3418-rebase-continue.sh | 62 +++++++++++----------------------- t/t3436-rebase-more-options.sh | 18 ---------- 6 files changed, 56 insertions(+), 132 deletions(-) -- 2.39.2
