From aaf8f79c679ea058c58a1114d380d99e1ff34156 Mon Sep 17 00:00:00 2001 From: Philippe Blain Date: Fri, 14 Feb 2025 17:36:17 +0000 Subject: [PATCH 1/2] config/remote.txt: reunite 'severOption' description paragraphs When 'remote..followRemoteHEAD' was added in b7f7d16562 (fetch: add configuration for set_head behaviour, 2024-11-29), its description was added to remote.txt in between the two paragraphs describing 'remote..serverOption'. Reunite these two paragraphs. Signed-off-by: Philippe Blain Signed-off-by: Junio C Hamano --- Documentation/config/remote.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Documentation/config/remote.txt b/Documentation/config/remote.txt index 4118c219c1..1b9814e8aa 100644 --- a/Documentation/config/remote.txt +++ b/Documentation/config/remote.txt @@ -101,6 +101,11 @@ remote..serverOption:: The default set of server options used when fetching from this remote. These server options can be overridden by the `--server-option=` command line arguments. ++ +This is a multi-valued variable, and an empty value can be used in a higher +priority configuration file (e.g. `.git/config` in a repository) to clear +the values inherited from a lower priority configuration files (e.g. +`$HOME/.gitconfig`). remote..followRemoteHEAD:: How linkgit:git-fetch[1] should handle updates to `remotes//HEAD`. @@ -114,8 +119,3 @@ remote..followRemoteHEAD:: 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. -+ -This is a multi-valued variable, and an empty value can be used in a higher -priority configuration file (e.g. `.git/config` in a repository) to clear -the values inherited from a lower priority configuration files (e.g. -`$HOME/.gitconfig`). From 0d03fda6a5db0b56df7e629ce856d2d38c89a4de Mon Sep 17 00:00:00 2001 From: Philippe Blain Date: Fri, 14 Feb 2025 17:36:18 +0000 Subject: [PATCH 2/2] config/remote.txt: improve wording for 'remote..followRemoteHEAD' Signed-off-by: Philippe Blain Signed-off-by: Junio C Hamano --- 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 1b9814e8aa..25fe219d10 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..followRemoteHEAD:: How linkgit:git-fetch[1] should handle updates to `remotes//HEAD`. The default value is "create", which will create `remotes//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//HEAD` to + the value on the remote. Finally, setting it to "never" will never + change or create the local reference.