mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
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>
This commit is contained in:
parent
b8bdaa97a6
commit
5cc3268720
|
@ -17,6 +17,9 @@ endif::git-pull[]
|
|||
by a colon `:`, followed by the destination ref <dst>.
|
||||
The colon can be omitted when <dst> is empty.
|
||||
+
|
||||
`tag <tag>` means the same as `refs/tags/<tag>:refs/tags/<tag>`;
|
||||
it requests fetching everything up to the given tag.
|
||||
+
|
||||
The remote ref that matches <src>
|
||||
is fetched, and if <dst> is not empty string, the local
|
||||
ref that matches it is fast-forwarded using <src>.
|
||||
|
@ -56,16 +59,3 @@ Octopus from remote refs is rarely done, while keeping track
|
|||
of multiple remote heads in one-go by fetching more than one
|
||||
is often useful.
|
||||
endif::git-pull[]
|
||||
+
|
||||
Some short-cut notations are also supported.
|
||||
+
|
||||
* `tag <tag>` means the same as `refs/tags/<tag>:refs/tags/<tag>`;
|
||||
it requests fetching everything up to the given tag.
|
||||
ifndef::git-pull[]
|
||||
* A parameter <ref> without a colon fetches that ref into FETCH_HEAD,
|
||||
endif::git-pull[]
|
||||
ifdef::git-pull[]
|
||||
* A parameter <ref> without a colon merges <ref> into the current
|
||||
branch,
|
||||
endif::git-pull[]
|
||||
and updates the remote-tracking branches (if any).
|
||||
|
|
Loading…
Reference in a new issue