diff options
| author | Miklos Vajna <vmiklos@frugalware.org> | 2008-01-25 11:17:38 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-01-26 07:42:36 +0100 |
| commit | 10eb64f5fdaad47ff1973a9c55e7aa87a4524190 (patch) | |
| tree | 283456fff2989460c898801519caf2efd897360d /Documentation/git-pull.txt | |
| parent | git-svn(1): update instructions for resuming a git-svn clone (diff) | |
| download | git-10eb64f5fdaad47ff1973a9c55e7aa87a4524190.tar.xz git-10eb64f5fdaad47ff1973a9c55e7aa87a4524190.zip | |
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>
Diffstat (limited to 'Documentation/git-pull.txt')
| -rw-r--r-- | Documentation/git-pull.txt | 1 |
1 files changed, 1 insertions, 0 deletions
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[] |