From 10eb64f5fdaad47ff1973a9c55e7aa87a4524190 Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Fri, 25 Jan 2008 10:17:38 +0000 Subject: [PATCH] git pull manpage: don't include -n from fetch-options.txt The -n option stands for --no-summary in git pull [jes: reworded the description to avoid mentioning 'git-fetch'; also exclude '-n' conditional on git-pull -- ugly because of the missing "else" statement in asciidoc] Signed-off-by: Miklos Vajna Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano --- Documentation/fetch-options.txt | 12 ++++++++---- Documentation/git-pull.txt | 1 + 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/Documentation/fetch-options.txt b/Documentation/fetch-options.txt index 61e48ccf02..b675911480 100644 --- a/Documentation/fetch-options.txt +++ b/Documentation/fetch-options.txt @@ -23,11 +23,15 @@ fetches is a descendant of ``. This option overrides that check. +ifdef::git-pull[] +\--no-tags:: +endif::git-pull[] +ifndef::git-pull[] -n, \--no-tags:: - By default, `git-fetch` fetches tags that point at - objects that are downloaded from the remote repository - and stores them locally. This option disables this - automatic tag following. +endif::git-pull[] + By default, tags that point at objects that are downloaded + from the remote repository are fetched and stored locally. + This option disables this automatic tag following. -t, \--tags:: Most of the tags are fetched automatically as branch diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt index 77fdaf146e..f9f1e0d30b 100644 --- a/Documentation/git-pull.txt +++ b/Documentation/git-pull.txt @@ -25,6 +25,7 @@ OPTIONS ------- include::merge-options.txt[] +:git-pull: 1 include::fetch-options.txt[] include::pull-fetch-param.txt[] -- 2.11.4.GIT