From: Philippe Blain <levraiphilippeblain@gmail.com>
To: Fernando Ramos <greenfoo@u92.eu>
Cc: git@vger.kernel.org, gitster@pobox.com, davvid@gmail.com,
sunshine@sunshineco.com, seth@eseth.com,
rogi@skylittlesystem.org, bagasdotme@gmail.com
Subject: Re: [PATCH v8 5/5] mergetools: add tools description to `git help config`
Date: Wed, 30 Mar 2022 14:45:59 -0400 [thread overview]
Message-ID: <de847041-acad-2a01-6a4f-36ed7318e01c@gmail.com> (raw)
In-Reply-To: <YkSij31hyi29g7v2@zacax395.localdomain>
Hi Fernando,
Le 2022-03-30 à 14:33, Fernando Ramos a écrit :
>> This commit is authored by you but is missing your sign off.
>> Also, I did not give my sign-off on this patch (that can't be assumed,
>> it always has to be expressively given).
>
> I see, sorry. As this patch is a verbatim copy of the one you provided in the
> last message I thought it was not appropriate to put my name on it (as it does
> not contain any line created by me)... but now I know that in these cases the
> right thing to do is to squash into the commit being commented on and add a
> "Helped-by:" note. Right?
Yes, right. :)
>
> I'll fix this in v9.
>
> Just to double check, please confirm this is what you want me to do:
>
> 1. Squash 5/5 into 3/5
yes.
>
> 2. Update the commit message to:
>
> 2.1 Explain that the description is also added to the output of `git help
> config`
Yes. For example, this is how I would phrase it, be free to copy
(maybe as the second-to-last paragraph?):
Note that the function 'show_tool_names', used in the implmentation of
'git mergetool --tool-help', is also used in Documentation/Makefile to
generate the list of allowed values for the configuration variables
'{diff,merge}.{gui,}tool'. Adjust the rule so its output is an Asciidoc
"description list" instead of a plain list, with the tool name as the item
and the newly added tool description as the description.
>
> 2.2 Remove your name from "Signed-off-by:"
>
> 2.3 Keep you name in "Helped-by:"
yes and yes.
>
> Thanks!
>
>
> PS: I must confess this whole process of sending patches to the git mailing
> list brings me back memories from "Asterix: The 12 Tasks" [1] :) :) :)
Yes, it can be hard. I prefer using Gitgitgadget most of the time [1].
[1] https://gitgitgadget.github.io/
next prev parent reply other threads:[~2022-03-30 18:46 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-28 22:30 [PATCH v7 0/4] vimdiff: new implementation with layout support Fernando Ramos
2022-03-28 22:30 ` [PATCH v7 1/4] " Fernando Ramos
2022-03-28 22:30 ` [PATCH v7 2/4] vimdiff: integrate layout tests in the unit tests framework ('t' folder) Fernando Ramos
2022-03-28 22:30 ` [PATCH v7 3/4] vimdiff: add tool documentation Fernando Ramos
2022-03-28 22:39 ` Fernando Ramos
2022-03-29 1:01 ` Junio C Hamano
2022-03-29 12:54 ` [PATCH] fixup! " Philippe Blain
2022-03-29 16:03 ` Junio C Hamano
2022-03-29 14:07 ` [PATCH v7 3/4] " Philippe Blain
2022-03-29 16:35 ` Junio C Hamano
2022-03-29 17:08 ` Philippe Blain
2022-03-29 17:29 ` Philippe Blain
2022-03-28 22:30 ` [PATCH v7 4/4] vimdiff: add description to already existing diff/merge tools Fernando Ramos
2022-03-29 16:38 ` Junio C Hamano
2022-03-29 17:24 ` Philippe Blain
2022-03-29 18:50 ` Junio C Hamano
2022-03-29 22:39 ` Fernando Ramos
2022-03-29 14:10 ` [PATCH v7 0/4] vimdiff: new implementation with layout support Philippe Blain
2022-03-29 21:45 ` Fernando Ramos
2022-03-29 22:44 ` [PATCH v8 0/5] " Fernando Ramos
2022-03-29 22:44 ` [PATCH v8 1/5] " Fernando Ramos
2022-03-29 22:44 ` [PATCH v8 2/5] vimdiff: integrate layout tests in the unit tests framework ('t' folder) Fernando Ramos
2022-03-29 22:44 ` [PATCH v8 3/5] vimdiff: add tool documentation Fernando Ramos
2022-03-29 22:44 ` [PATCH v8 4/5] mergetools: add description to all diff/merge tools Fernando Ramos
2022-03-29 22:44 ` [PATCH v8 5/5] mergetools: add tools description to `git help config` Fernando Ramos
2022-03-30 12:43 ` Philippe Blain
2022-03-30 18:33 ` Fernando Ramos
2022-03-30 18:45 ` Philippe Blain [this message]
2022-03-30 19:19 ` [PATCH v9 0/4] vimdiff: new implementation with layout support Fernando Ramos
2022-03-30 19:19 ` [PATCH v9 1/4] " Fernando Ramos
2022-03-30 19:19 ` [PATCH v9 2/4] vimdiff: integrate layout tests in the unit tests framework ('t' folder) Fernando Ramos
2022-03-30 19:19 ` [PATCH v9 3/4] vimdiff: add tool documentation Fernando Ramos
2022-04-03 20:02 ` Philippe Blain
2022-04-03 22:44 ` Junio C Hamano
2022-04-04 20:00 ` Fernando Ramos
2022-04-04 21:38 ` Junio C Hamano
2022-03-30 19:19 ` [PATCH v9 4/4] mergetools: add description to all diff/merge tools Fernando Ramos
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=de847041-acad-2a01-6a4f-36ed7318e01c@gmail.com \
--to=levraiphilippeblain@gmail.com \
--cc=bagasdotme@gmail.com \
--cc=davvid@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=greenfoo@u92.eu \
--cc=rogi@skylittlesystem.org \
--cc=seth@eseth.com \
--cc=sunshine@sunshineco.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).