From: Philippe Blain <levraiphilippeblain@gmail.com>
To: Bence Ferdinandy <bence@ferdinandy.com>,
Philippe Blain via GitGitGadget <gitgitgadget@gmail.com>,
git@vger.kernel.org
Subject: Re: [PATCH 2/2] config/remote.txt: improve wording for 'remote.<name>.followRemoteHEAD'
Date: Mon, 24 Feb 2025 21:58:01 -0500 [thread overview]
Message-ID: <f7ec8e1b-7f77-c989-e07d-73e6c5d05e2f@gmail.com> (raw)
In-Reply-To: <D7SID7X5ZGKY.BZY6LVZ57YUR@ferdinandy.com>
Hi Bence,
Le 2025-02-14 à 17:05, Bence Ferdinandy a écrit :
>
> On Fri Feb 14, 2025 at 18:36, Philippe Blain via GitGitGadget <gitgitgadget@gmail.com> wrote:
>> From: Philippe Blain <levraiphilippeblain@gmail.com>
>>
>> Signed-off-by: Philippe Blain <levraiphilippeblain@gmail.com>
>> ---
>> Documentation/config/remote.txt | 12 ++++++------
>> 1 file changed, 6 insertions(+), 6 deletions(-)
>>
>> diff --git a/Documentation/config/remote.txt b/Documentation/config/remote.txt
>> index 1b9814e8aa4..25fe219d103 100644
>> --- a/Documentation/config/remote.txt
>> +++ b/Documentation/config/remote.txt
>> @@ -110,12 +110,12 @@ the values inherited from a lower priority configuration files (e.g.
>> remote.<name>.followRemoteHEAD::
>> How linkgit:git-fetch[1] should handle updates to `remotes/<name>/HEAD`.
>> The default value is "create", which will create `remotes/<name>/HEAD`
>> - if it exists on the remote, but not locally, but will not touch an
>> - already existing local reference. Setting to "warn" will print
>> - a message if the remote has a different value, than the local one and
>> + if it exists on the remote, but not locally; this will not touch an
>> + already existing local reference. Setting it to "warn" will print
>> + a message if the remote has a different value than the local one;
>> in case there is no local reference, it behaves like "create".
>> A variant on "warn" is "warn-if-not-$branch", which behaves like
>> "warn", but if `HEAD` on the remote is `$branch` it will be silent.
>> - Setting to "always" will silently update it to the value on the remote.
>> - Finally, setting it to "never" will never change or create the local
>> - reference.
>> + Setting it to "always" will silently update `remotes/<name>/HEAD` to
>> + the value on the remote. Finally, setting it to "never" will never
>> + change or create the local reference.
>
> I'm personally not a huge fan of semicolons, but I do agree that the text does
> not flow particularly well. Wouldn't it actually make sense to format this as
> a list, with an entry for each option? The would probably also help in quickly
> parsing how many options there are.
I think lists are a good idea in general, but since there is no uniformity with regards
to that in the rest of the documentation, I would keep it as-is for this series.
Thanks,
Philippe.
prev parent reply other threads:[~2025-02-25 2:55 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-02-14 17:36 [PATCH 0/2] Documentation: fixups following followRemoteHEAD Philippe Blain via GitGitGadget
2025-02-14 17:36 ` [PATCH 1/2] config/remote.txt: reunite 'severOption' description paragraphs Philippe Blain via GitGitGadget
2025-02-14 22:01 ` Bence Ferdinandy
2025-02-14 22:11 ` Junio C Hamano
2025-02-14 17:36 ` [PATCH 2/2] config/remote.txt: improve wording for 'remote.<name>.followRemoteHEAD' Philippe Blain via GitGitGadget
2025-02-14 22:05 ` Bence Ferdinandy
2025-02-25 2:58 ` Philippe Blain [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=f7ec8e1b-7f77-c989-e07d-73e6c5d05e2f@gmail.com \
--to=levraiphilippeblain@gmail.com \
--cc=bence@ferdinandy.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.