X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fpull-fetch-param.txt;h=0551ebdfafb3f41dd0e31d3c74ce42fff33e38e1;hb=3cc3fb7df67dc9c83b71fec82e5bfb1df3724089;hp=f9811f24733bde97b76dc8e695bad82eace5586b;hpb=78b77c491ff21e27dbaf1381268aeb380f0607b8;p=git.git diff --git a/Documentation/pull-fetch-param.txt b/Documentation/pull-fetch-param.txt index f9811f247..0551ebdfa 100644 --- a/Documentation/pull-fetch-param.txt +++ b/Documentation/pull-fetch-param.txt @@ -4,6 +4,13 @@ (see the section <> below) or the name of a remote (see the section <> below). +ifndef::git-pull[] +:: + A name referring to a list of repositories as the value + of remotes. in the configuration file. + (See linkgit:git-config[1]). +endif::git-pull[] + :: The format of a parameter is an optional plus `{plus}`, followed by the source ref , followed @@ -11,9 +18,9 @@ + The remote ref that matches is fetched, and if is not empty string, the local -ref that matches it is fast forwarded using . +ref that matches it is fast-forwarded using . If the optional plus `+` is used, the local ref -is updated even if it does not result in a fast forward +is updated even if it does not result in a fast-forward update. + [NOTE]