From 10eb64f5fdaad47ff1973a9c55e7aa87a4524190 Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Fri, 25 Jan 2008 10:17:38 +0000 Subject: 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/git-pull.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'Documentation/git-pull.txt') 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[] -- cgit v1.3-5-g9baa