Skip to content

Commit 5cc3268

Browse files
committed
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 <[email protected]>
1 parent b8bdaa9 commit 5cc3268

File tree

1 file changed

+3
-13
lines changed

1 file changed

+3
-13
lines changed

Documentation/pull-fetch-param.txt

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@ endif::git-pull[]
1717
by a colon `:`, followed by the destination ref <dst>.
1818
The colon can be omitted when <dst> is empty.
1919
+
20+
`tag <tag>` means the same as `refs/tags/<tag>:refs/tags/<tag>`;
21+
it requests fetching everything up to the given tag.
22+
+
2023
The remote ref that matches <src>
2124
is fetched, and if <dst> is not empty string, the local
2225
ref that matches it is fast-forwarded using <src>.
@@ -56,16 +59,3 @@ Octopus from remote refs is rarely done, while keeping track
5659
of multiple remote heads in one-go by fetching more than one
5760
is often useful.
5861
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).

0 commit comments

Comments
 (0)