From: Phillip Wood <phillip.wood123@gmail.com>
To: Junio C Hamano <gitster@pobox.com>, git@vger.kernel.org
Cc: Brian Lyles <brianmlyles@gmail.com>
Subject: Re: What's cooking in git.git (Mar 2024, #07; Fri, 22)
Date: Mon, 25 Mar 2024 16:39:00 +0000 [thread overview]
Message-ID: <16e7bca8-2701-4b33-a7c1-32e0e859e2cc@gmail.com> (raw)
In-Reply-To: <xmqqedc1zs1p.fsf@gitster.g>
Hi Junio
On 23/03/2024 00:54, Junio C Hamano wrote:
> * 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
prev parent reply other threads:[~2024-03-25 20:40 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-23 0:54 What's cooking in git.git (Mar 2024, #07; Fri, 22) Junio C Hamano
2024-03-25 6:42 ` Patrick Steinhardt
2024-03-25 18:38 ` Junio C Hamano
2024-03-25 16:39 ` Phillip Wood [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=16e7bca8-2701-4b33-a7c1-32e0e859e2cc@gmail.com \
--to=phillip.wood123@gmail.com \
--cc=brianmlyles@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=phillip.wood@dunelm.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).