From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 4 Apr 2023 21:28:27 +0000 (-0700)
Subject: Merge branch 'ah/rebase-merges-config'
X-Git-Tag: v2.41.0-rc0~115
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9142fce9b09dbc12cd99704d3ea0899efb350c39;p=thirdparty%2Fgit.git

Merge branch 'ah/rebase-merges-config'

Streamline --rebase-merges command line option handling and
introduce rebase.merges configuration variable.

* ah/rebase-merges-config:
  rebase: add a config option for --rebase-merges
  rebase: deprecate --rebase-merges=""
  rebase: add documentation and test for --no-rebase-merges
---

9142fce9b09dbc12cd99704d3ea0899efb350c39