| Message ID | cc2e59ca0475ea2d4f2df7784d5a4c81a70c264c.1739554578.git.gitgitgadget@gmail.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | Documentation: fixups following followRemoteHEAD | expand |
On Fri Feb 14, 2025 at 18:36, Philippe Blain via GitGitGadget <gitgitgadget@gmail.com> wrote: > 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> > --- Auch, that was sloppy. Thanks for cleaning up the mistake!
"Philippe Blain via GitGitGadget" <gitgitgadget@gmail.com> writes: > 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. Ouch. Thanks for spotting and fixing. > > 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`).
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`).