| commit | 90c80966571f9aae613c24ce731463a27728bdd3 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Sun, 29 Oct 2023 22:09:58 +0000 (30 07:09 +0900) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 29 Oct 2023 22:09:58 +0000 (30 07:09 +0900) | ||
| tree | 8e41d48f0799ed092f211736463600f540361909 | treesnapshot (tar.gz zip) |
| parent | 4fcbc5b94fdc0748053bb1c45fa04107f5768554 | commitdiff |
| parent | 96db17352d8821ceb99dd9e1c19bd74d680effb7 | commitdiff |
Merge branch 'ob/rebase-cleanup'
Code clean-up.
* ob/rebase-cleanup:
rebase: move parse_opt_keep_empty() down
rebase: handle --strategy via imply_merge() as well
rebase: simplify code related to imply_merge()
Code clean-up.
* ob/rebase-cleanup:
rebase: move parse_opt_keep_empty() down
rebase: handle --strategy via imply_merge() as well
rebase: simplify code related to imply_merge()