From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 4 Feb 2023 00:08:21 +0000 (-0800)
Subject: Merge branch 'en/rebase-incompatible-opts'
X-Git-Tag: v2.40.0-rc0~38
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2c6e5b32aa09d0c21bc9b1d6b74ce3fb94e787aa;p=thirdparty%2Fgit.git

Merge branch 'en/rebase-incompatible-opts'

"git rebase" often ignored incompatible options instead of
complaining, which has been corrected.

* en/rebase-incompatible-opts:
  rebase: provide better error message for apply options vs. merge config
  rebase: put rebase_options initialization in single place
  rebase: fix formatting of rebase --reapply-cherry-picks option in docs
  rebase: clarify the OPT_CMDMODE incompatibilities
  rebase: add coverage of other incompatible options
  rebase: fix incompatiblity checks for --[no-]reapply-cherry-picks
  rebase: fix docs about incompatibilities with --root
  rebase: remove --allow-empty-message from incompatible opts
  rebase: flag --apply and --merge as incompatible
  rebase: mark --update-refs as requiring the merge backend
---

2c6e5b32aa09d0c21bc9b1d6b74ce3fb94e787aa