Skip to content

Commit 0d03fda

Browse files
phil-blaingitster
authored andcommitted
config/remote.txt: improve wording for 'remote.<name>.followRemoteHEAD'
Signed-off-by: Philippe Blain <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent aaf8f79 commit 0d03fda

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

Documentation/config/remote.txt

+6-6
Original file line numberDiff line numberDiff line change
@@ -110,12 +110,12 @@ the values inherited from a lower priority configuration files (e.g.
110110
remote.<name>.followRemoteHEAD::
111111
How linkgit:git-fetch[1] should handle updates to `remotes/<name>/HEAD`.
112112
The default value is "create", which will create `remotes/<name>/HEAD`
113-
if it exists on the remote, but not locally, but will not touch an
114-
already existing local reference. Setting to "warn" will print
115-
a message if the remote has a different value, than the local one and
113+
if it exists on the remote, but not locally; this will not touch an
114+
already existing local reference. Setting it to "warn" will print
115+
a message if the remote has a different value than the local one;
116116
in case there is no local reference, it behaves like "create".
117117
A variant on "warn" is "warn-if-not-$branch", which behaves like
118118
"warn", but if `HEAD` on the remote is `$branch` it will be silent.
119-
Setting to "always" will silently update it to the value on the remote.
120-
Finally, setting it to "never" will never change or create the local
121-
reference.
119+
Setting it to "always" will silently update `remotes/<name>/HEAD` to
120+
the value on the remote. Finally, setting it to "never" will never
121+
change or create the local reference.

0 commit comments

Comments
 (0)