diff options
| author |  Miklos Vajna <vmiklos@frugalware.org> | 2008-01-25 10:17:38 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2008-01-25 22:42:36 -0800 |
| commit | 10eb64f5fdaad47ff1973a9c55e7aa87a4524190 (patch) | |
| tree | 283456fff2989460c898801519caf2efd897360d | |
| parent | git-svn(1): update instructions for resuming a git-svn clone (diff) | |
| download | tgif-10eb64f5fdaad47ff1973a9c55e7aa87a4524190.tar.xz | |
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 <vmiklos@frugalware.org>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | Documentation/fetch-options.txt | 12 | ||||
| -rw-r--r-- | 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 `<lbranch>`. 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[] |