Re: What's cooking in git.git (Mar 2024, #07; Fri, 22)
- From
- Phillip Wood <phillip.wood123@gmail.com>
- Date
- Mar 25, 2024, 16:39 UTC
- Message-ID
- <16e7bca8-2701-4b33-a7c1-32e0e859e2cc@gmail.com>
- In-Reply-To
- <xmqqedc1zs1p.fsf@gitster.g>
Hi Junio
On 23/03/2024 00:54, Junio C Hamano wrote:
Show 16 quoted lines
> * bl/cherry-pick-empty (2024-03-20) 7 commits > - 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` > > 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. > > Will merge to 'next'?
The latest version looks fine to me apart from a couple of rather long lines, I'd be happy to see it merged as is if you're happy with it.
Best Wishes
Phillip