| commit | 3c957e6d399452897209d90fc0528a77bb093df3 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 18 Apr 2023 01:05:13 +0000 (17 18:05 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 18 Apr 2023 01:05:13 +0000 (17 18:05 -0700) | ||
| tree | 9db9f2a1e962349bf90b350bf2d5244185fcfcb3 | treesnapshot (tar.gz zip) |
| parent | 66bf8f19439556da7cf1c8852d07b87257f2a7d9 | commitdiff |
| parent | 05106aa198cd0f8a5643556ac9f8a1dfdbdb5bdd | commitdiff |
Merge branch 'pw/rebase-cleanup-merge-strategy-option-handling'
Clean-up of the code path that deals with merge strategy option
handling in "git rebase".
* pw/rebase-cleanup-merge-strategy-option-handling:
rebase: remove a couple of redundant strategy tests
rebase -m: fix serialization of strategy options
rebase -m: cleanup --strategy-option handling
sequencer: use struct strvec to store merge strategy options
rebase: stop reading and writing unnecessary strategy state
Clean-up of the code path that deals with merge strategy option
handling in "git rebase".
* pw/rebase-cleanup-merge-strategy-option-handling:
rebase: remove a couple of redundant strategy tests
rebase -m: fix serialization of strategy options
rebase -m: cleanup --strategy-option handling
sequencer: use struct strvec to store merge strategy options
rebase: stop reading and writing unnecessary strategy state