diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-04-18 03:05:13 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-04-18 03:05:13 +0200 |
| commit | 3c957e6d399452897209d90fc0528a77bb093df3 (patch) | |
| tree | 9db9f2a1e962349bf90b350bf2d5244185fcfcb3 /sideband.c | |
| parent | Merge branch 'cm/branch-delete-error-message-update' (diff) | |
| parent | rebase: remove a couple of redundant strategy tests (diff) | |
| download | git-3c957e6d399452897209d90fc0528a77bb093df3.tar.xz git-3c957e6d399452897209d90fc0528a77bb093df3.zip | |
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
Diffstat (limited to 'sideband.c')
0 files changed, 0 insertions, 0 deletions