Skip to content

Commit aaf8f79

Browse files
phil-blaingitster
authored andcommitted
config/remote.txt: reunite 'severOption' description paragraphs
When 'remote.<name>.followRemoteHEAD' was added in b7f7d16 (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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent f93ff17 commit aaf8f79

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

Documentation/config/remote.txt

+5-5
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,11 @@ remote.<name>.serverOption::
101101
The default set of server options used when fetching from this remote.
102102
These server options can be overridden by the `--server-option=` command
103103
line arguments.
104+
+
105+
This is a multi-valued variable, and an empty value can be used in a higher
106+
priority configuration file (e.g. `.git/config` in a repository) to clear
107+
the values inherited from a lower priority configuration files (e.g.
108+
`$HOME/.gitconfig`).
104109

105110
remote.<name>.followRemoteHEAD::
106111
How linkgit:git-fetch[1] should handle updates to `remotes/<name>/HEAD`.
@@ -114,8 +119,3 @@ remote.<name>.followRemoteHEAD::
114119
Setting to "always" will silently update it to the value on the remote.
115120
Finally, setting it to "never" will never change or create the local
116121
reference.
117-
+
118-
This is a multi-valued variable, and an empty value can be used in a higher
119-
priority configuration file (e.g. `.git/config` in a repository) to clear
120-
the values inherited from a lower priority configuration files (e.g.
121-
`$HOME/.gitconfig`).

0 commit comments

Comments
 (0)