From: Jeff King Date: Sat, 11 May 2013 16:14:25 GMT Subject: [PATCH 2/4] fetch/pull doc: untangle meaning of bare Message-ID: <20130511161425.GB3270@sigill.intra.peff.net> In-Reply-To: <20130511161320.GA14990@sigill.intra.peff.net> From: Thomas Rast The documentation erroneously used the same wording for both fetch and pull, stating that something will be merged even in git-fetch(1). In addition, saying that " is equivalent to :" doesn't really help anyone who still needs to read manpages. Clarify what is actually going on. Signed-off-by: Thomas Rast Signed-off-by: Jeff King --- Documentation/pull-fetch-param.txt | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/Documentation/pull-fetch-param.txt b/Documentation/pull-fetch-param.txt index 94a9d32..6f5ca21 100644 --- a/Documentation/pull-fetch-param.txt +++ b/Documentation/pull-fetch-param.txt @@ -68,6 +68,11 @@ 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. -* A parameter without a colon is equivalent to - : when pulling/fetching, so it merges into the current - branch without storing the remote branch anywhere locally +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[] + while not storing the branch anywhere locally. -- 1.8.3.rc1.2.g12db477