From: Junio C Hamano <gitster@pobox.com>
To: "Kristoffer Haugsbakk" <kristofferhaugsbakk@fastmail.com>
Cc: git@vger.kernel.org, "Phillip Wood" <phillip.wood@dunelm.org.uk>
Subject: Re: What's cooking in git.git (Dec 2025, #02)
Date: Wed, 10 Dec 2025 18:20:00 +0900 [thread overview]
Message-ID: <xmqqfr9iithb.fsf@gitster.g> (raw)
In-Reply-To: <39b57721-ab9e-489d-a382-16d9fe94c300@app.fastmail.com> (Kristoffer Haugsbakk's message of "Wed, 10 Dec 2025 08:55:16 +0100")
"Kristoffer Haugsbakk" <kristofferhaugsbakk@fastmail.com> writes:
> On Tue, Dec 9, 2025, at 22:08, Junio C Hamano wrote:
>> * kh/doc-replay-updates (2025-12-07) 3 commits
>> - doc: replay: link section using markup
>> - doc: replay: document --contained
>> - doc: replay: mention no output on conflicts
>>
>> "git replay" documentation updates.
>>
>> Will merge to 'next'.
>> source: <CV_replay_conflict.101@msgid.xyz>
>
> This needs a new version to at the least incorporate the “Requires
> --onto” on `--contained` suggestion from Phillip.
Ah, very true. Thanks for correcting me.
prev parent reply other threads:[~2025-12-10 9:20 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-12-09 21:08 What's cooking in git.git (Dec 2025, #02) Junio C Hamano
2025-12-09 22:46 ` Karthik Nayak
2025-12-09 23:10 ` Junio C Hamano
2025-12-10 10:04 ` Karthik Nayak
2025-12-10 12:00 ` Junio C Hamano
2025-12-12 21:29 ` Karthik Nayak
2025-12-10 7:55 ` Kristoffer Haugsbakk
2025-12-10 9:20 ` Junio C Hamano [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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqfr9iithb.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=kristofferhaugsbakk@fastmail.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.
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 NNTP newsgroup(s).