From: Junio C Hamano <gitster@pobox.com>
To: Philippe Blain <levraiphilippeblain@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: What's cooking in git.git (Nov 2024, #08; Fri, 22)
Date: Mon, 25 Nov 2024 09:23:58 +0900 [thread overview]
Message-ID: <xmqqzflo88kh.fsf@gitster.g> (raw)
In-Reply-To: <558f7192-6dd6-8434-c07a-921e2e55754a@gmail.com> (Philippe Blain's message of "Fri, 22 Nov 2024 14:10:09 -0500")
Philippe Blain <levraiphilippeblain@gmail.com> writes:
> Hi Junio,
>
> Le 2024-11-22 à 05:11, Junio C Hamano a écrit :
>
>>
>> * pb/mergetool-errors (2024-11-13) 5 commits
>> - git-difftool--helper.sh: exit upon initialize_merge_tool errors
>> - git-mergetool--lib.sh: add error message for unknown tool variant
>> - git-mergetool--lib.sh: add error message in 'setup_user_tool'
>> - git-mergetool--lib.sh: use TOOL_MODE when erroring about unknown tool
>> - completion: complete '--tool-help' in 'git mergetool'
>>
>> End-user experience of "git mergetool" when the command errors out
>> has been improved.
>>
>> Will merge to 'next'?
>> source: <pull.1827.git.1731459128.gitgitgadget@gmail.com>
>
> I'll send a v2 with some enhancements you suggested, so maybe wait a bit.
Thanks, will do.
next prev parent reply other threads:[~2024-11-25 0:24 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-11-22 10:11 What's cooking in git.git (Nov 2024, #08; Fri, 22) Junio C Hamano
2024-11-22 19:10 ` Philippe Blain
2024-11-25 0:23 ` Junio C Hamano [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-11-22 14:31 Caleb White
2024-11-25 0:25 ` Junio C Hamano
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=xmqqzflo88kh.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=levraiphilippeblain@gmail.com \
/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).