From: Junio C Hamano Date: Tue, 03 Jun 2014 22:16:30 GMT Subject: [PATCH v2 7/9] fetch doc: remove "short-cut" section Message-ID: <1401833792-2486-8-git-send-email-gitster@pobox.com> In-Reply-To: <1401833792-2486-1-git-send-email-gitster@pobox.com> It is misleading to mention that 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". 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 ` as the only true short-hand, so move it at the beginning of the entry. Signed-off-by: Junio C Hamano --- Documentation/pull-fetch-param.txt | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/Documentation/pull-fetch-param.txt b/Documentation/pull-fetch-param.txt index a090d4a..9e62434 100644 --- a/Documentation/pull-fetch-param.txt +++ b/Documentation/pull-fetch-param.txt @@ -17,6 +17,9 @@ endif::git-pull[] by a colon `:`, followed by the destination ref . The colon can be omitted when is empty. + +`tag ` means the same as `refs/tags/:refs/tags/`; +it requests fetching everything up to the given tag. ++ The remote ref that matches is fetched, and if is not empty string, the local ref that matches it is fast-forwarded using . @@ -55,16 +58,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 ` means the same as `refs/tags/:refs/tags/`; - it requests fetching everything up to the given tag. -ifndef::git-pull[] -* A parameter without a colon fetches that ref into FETCH_HEAD, -endif::git-pull[] -ifdef::git-pull[] -* A parameter without a colon merges into the current - branch, -endif::git-pull[] - and updates the remote-tracking branches (if any). -- 2.0.0-511-g1433423