From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 3 Apr 2024 17:56:20 +0000 (-0700)
Subject: Merge branch 'bl/cherry-pick-empty'
X-Git-Tag: v2.45.0-rc0~50
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=17381ab62a2a4634d79c96ee020dce64c3e516b7;p=thirdparty%2Fgit.git

Merge branch 'bl/cherry-pick-empty'

Allow git-cherry-pick(1) to automatically drop redundant commits via
a new `--empty` option, similar to the `--empty` options for
git-rebase(1) and git-am(1). Includes a soft deprecation of
`--keep-redundant-commits` as well as some related docs changes and
sequencer code cleanup.

* bl/cherry-pick-empty:
  cherry-pick: add `--empty` for more robust redundant commit handling
  cherry-pick: enforce `--keep-redundant-commits` incompatibility
  sequencer: do not require `allow_empty` for redundant commit options
  sequencer: handle unborn branch with `--allow-empty`
  rebase: update `--empty=ask` to `--empty=stop`
  docs: clean up `--empty` formatting in git-rebase(1) and git-am(1)
  docs: address inaccurate `--empty` default with `--exec`
---

17381ab62a2a4634d79c96ee020dce64c3e516b7