X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fpull-fetch-param.txt;h=f9811f24733bde97b76dc8e695bad82eace5586b;hb=8b3dce565084c89ceb19f7ccf0fe22ffd365f7fd;hp=00a8d210476089257be3d09ac8a16d1f8e1dd8dc;hpb=948e7471e03340307e802e919303256f80273d21;p=git.git diff --git a/Documentation/pull-fetch-param.txt b/Documentation/pull-fetch-param.txt index 00a8d2104..f9811f247 100644 --- a/Documentation/pull-fetch-param.txt +++ b/Documentation/pull-fetch-param.txt @@ -5,15 +5,14 @@ of a remote (see the section <> below). :: - The canonical format of a parameter is - `+?:`; that is, an optional plus `+`, followed - by the source ref, followed by a colon `:`, followed by - the destination ref. + The format of a parameter is an optional plus + `{plus}`, followed by the source ref , followed + by a colon `:`, followed by the destination ref . + The remote ref that matches is fetched, and if is not empty string, the local ref that matches it is fast forwarded using . -Again, if the optional plus `+` is used, the local ref +If the optional plus `+` is used, the local ref is updated even if it does not result in a fast forward update. +