summaryrefslogtreecommitdiff
path: root/Documentation/git-pull.txt
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@frugalware.org>2008-01-25 10:17:38 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-01-26 06:42:36 (GMT)
commit10eb64f5fdaad47ff1973a9c55e7aa87a4524190 (patch)
tree283456fff2989460c898801519caf2efd897360d /Documentation/git-pull.txt
parent2b0d1033a3af476296af6b5d8f524829c6790c1f (diff)
downloadgit-10eb64f5fdaad47ff1973a9c55e7aa87a4524190.zip
git-10eb64f5fdaad47ff1973a9c55e7aa87a4524190.tar.gz
git-10eb64f5fdaad47ff1973a9c55e7aa87a4524190.tar.bz2
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.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt
index 77fdaf1..f9f1e0d 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[]