fetch doc: remove "short-cut" section
It is misleading to mention that <ref> that does not store is to fetch the ref into FETCH_HEAD, because a refspec that does store is also to fetch the LHS into FETCH_HEAD. It is doubly misleading to list it as part of "short-cut". <ref> stands for a refspec that has it on the LHS with a colon and an empty RHS, and that definition should be given at the beginning of the entry where the format is defined. Tentatively remove this misleading description, which leaves the `tag <tag>` as the only true short-hand, so move it at the beginning of the entry. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
May 29, 2014 at 13:22 UTC
5cc3268720bd64f7dcc11843060fcebbe84f1a39
1 file changed
+3
-13
Documentation/pull-fetch-param.txt
+3
-13
@@ -17,6 +17,9 @@ endif::git-pull[]
17
by a colon `:`, followed by the destination ref <dst>.
18
The colon can be omitted when <dst> is empty.
19
+
20
+`tag <tag>` means the same as `refs/tags/<tag>:refs/tags/<tag>`;
21
+it requests fetching everything up to the given tag.
22
++
23
The remote ref that matches <src>
24
is fetched, and if <dst> is not empty string, the local
25
ref that matches it is fast-forwarded using <src>.
@@ -56,16 +59,3 @@ Octopus from remote refs is rarely done, while keeping track
59
of multiple remote heads in one-go by fetching more than one
60
is often useful.
61
endif::git-pull[]
59
-+
60
-Some short-cut notations are also supported.
61
-+
62
-* `tag <tag>` means the same as `refs/tags/<tag>:refs/tags/<tag>`;
63
- it requests fetching everything up to the given tag.
64
-ifndef::git-pull[]
65
-* A parameter <ref> without a colon fetches that ref into FETCH_HEAD,
66
-endif::git-pull[]
67
-ifdef::git-pull[]
68
-* A parameter <ref> without a colon merges <ref> into the current
69
- branch,
70
-endif::git-pull[]
71
- and updates the remote-tracking branches (if any).