From: Philippe Blain Date: Fri, 14 Feb 2025 17:36:17 +0000 (+0000) Subject: config/remote.txt: reunite 'severOption' description paragraphs X-Git-Tag: v2.49.0~3^2~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=aaf8f79c679ea058c58a1114d380d99e1ff34156;p=thirdparty%2Fgit.git 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 --- 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`).