diff options
| author | Philippe Blain <levraiphilippeblain@gmail.com> | 2025-02-14 17:36:17 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-02-14 14:09:36 -0800 |
| commit | aaf8f79c679ea058c58a1114d380d99e1ff34156 (patch) | |
| tree | f8fd6a40e82e8995c2560850f571846abdbec38d | |
| parent | f93ff170b93a1782659637824b25923245ac9dd1 (diff) | |
| download | git-aaf8f79c679ea058c58a1114d380d99e1ff34156.tar.gz | |
config/remote.txt: reunite 'severOption' description paragraphs
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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | Documentation/config/remote.txt | 10 |
1 files 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.<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`). |