From db4e4113ea33ece52c5988f9b9f7c0559c802602 Mon Sep 17 00:00:00 2001 From: Marc Branchaud Date: Wed, 11 Jun 2014 10:24:04 -0400 Subject: [PATCH] docs: Explain the purpose of fetch's and pull's parameter. Signed-off-by: Marc Branchaud Signed-off-by: Junio C Hamano --- Documentation/git-fetch.txt | 4 ++-- Documentation/pull-fetch-param.txt | 18 ++++++++++++++---- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/Documentation/git-fetch.txt b/Documentation/git-fetch.txt index 629a1cfe00..8deb61469d 100644 --- a/Documentation/git-fetch.txt +++ b/Documentation/git-fetch.txt @@ -51,8 +51,8 @@ include::pull-fetch-param.txt[] include::urls-remotes.txt[] -CONFIGURED REMOTE-TRACKING BRANCHES ------------------------------------ +CONFIGURED REMOTE-TRACKING BRANCHES[[CRTB]] +------------------------------------------- You often interact with the same remote repository by regularly and repeatedly fetching from it. In order to keep track diff --git a/Documentation/pull-fetch-param.txt b/Documentation/pull-fetch-param.txt index 4bff65b0e9..1ebbf1d738 100644 --- a/Documentation/pull-fetch-param.txt +++ b/Documentation/pull-fetch-param.txt @@ -12,10 +12,20 @@ ifndef::git-pull[] endif::git-pull[] :: - The format of a parameter is an optional plus - `+`, followed by the source ref , followed - by a colon `:`, followed by the destination ref . - The colon can be omitted when is empty. + Specifies which refs to fetch and which local refs to update. + When no s appear on the command line, the refs to fetch + are read from `remote..fetch` variables instead +ifndef::git-pull[] + (see <> below). +endif::git-pull[] +ifdef::git-pull[] + (see linkgit:git-fetch[1]). +endif::git-pull[] ++ +The format of a parameter is an optional plus +`+`, followed by the source ref , followed +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. -- 2.11.4.GIT