From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 29 Oct 2023 22:09:58 +0000 (+0900)
Subject: Merge branch 'ob/rebase-cleanup'
X-Git-Tag: v2.43.0-rc0~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=90c80966571f9aae613c24ce731463a27728bdd3;p=thirdparty%2Fgit.git

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()
---

90c80966571f9aae613c24ce731463a27728bdd3