From: Philippe Blain Date: Fri, 14 Feb 2025 17:36:18 +0000 (+0000) Subject: config/remote.txt: improve wording for 'remote..followRemoteHEAD' X-Git-Tag: v2.49.0~3^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0d03fda6a5db0b56df7e629ce856d2d38c89a4de;p=thirdparty%2Fgit.git config/remote.txt: improve wording for 'remote..followRemoteHEAD' Signed-off-by: Philippe Blain Signed-off-by: Junio C Hamano --- diff --git a/Documentation/config/remote.txt b/Documentation/config/remote.txt index 1b9814e8aa..25fe219d10 100644 --- a/Documentation/config/remote.txt +++ b/Documentation/config/remote.txt @@ -110,12 +110,12 @@ the values inherited from a lower priority configuration files (e.g. remote..followRemoteHEAD:: How linkgit:git-fetch[1] should handle updates to `remotes//HEAD`. The default value is "create", which will create `remotes//HEAD` - if it exists on the remote, but not locally, but will not touch an - already existing local reference. Setting to "warn" will print - a message if the remote has a different value, than the local one and + if it exists on the remote, but not locally; this will not touch an + already existing local reference. Setting it to "warn" will print + a message if the remote has a different value than the local one; in case there is no local reference, it behaves like "create". A variant on "warn" is "warn-if-not-$branch", which behaves like "warn", but if `HEAD` on the remote is `$branch` it will be silent. - 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. + Setting it to "always" will silently update `remotes//HEAD` to + the value on the remote. Finally, setting it to "never" will never + change or create the local reference.