git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH 1/2] config/remote.txt: reunite 'severOption' description paragraphs

From
Philippe Blain via GitGitGadget <gitgitgadget@gmail.com>
Date
Feb 14, 2025, 17:36 UTC
Message-ID
<cc2e59ca0475ea2d4f2df7784d5a4c81a70c264c.1739554578.git.gitgitgadget@gmail.com>
In-Reply-To
<pull.1894.git.git.1739554578.gitgitgadget@gmail.com>
From: Philippe Blain <levraiphilippeblain@gmail.com>

When 'remote.<name>.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.<name>.serverOption'. Reunite these two paragraphs.

Signed-off-by: Philippe Blain <levraiphilippeblain@gmail.com>
---
 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 4118c219c13..1b9814e8aa4 100644
--- a/Documentation/config/remote.txt
+++ b/Documentation/config/remote.txt
@@ -101,6 +101,11 @@ remote.<name>.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.<name>.followRemoteHEAD::
 	How linkgit:git-fetch[1] should handle updates to `remotes/<name>/HEAD`.
@@ -114,8 +119,3 @@ remote.<name>.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`).
-- 
gitgitgadget
Previous: Philippe Blain via GitGitGadgetNext: Bence Ferdinandy
Message 2 of 7 in “Documentation: fixups following followRemoteHEAD”
  1. 0/2 Documentation: fixups following followRemoteHEADPhilippe Blain via GitGitGadget, Feb 14, 2025
  2. 1/2 config/remote.txt: reunite 'severOption' description paragraphsPhilippe Blain via GitGitGadget, Feb 14, 2025
  3. Bence FerdinandyFeb 14, 2025
  4. Junio C HamanoFeb 14, 2025
  5. 2/2 config/remote.txt: improve wording for 'remote.<name>.followRemoteHEAD'Philippe Blain via GitGitGadget, Feb 14, 2025
  6. Bence FerdinandyFeb 14, 2025
  7. Philippe BlainFeb 25, 2025

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.