aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmmanuel Trillaud <etrillaud@gmail.com>2009-09-07 14:34:35 +0200
committerJunio C Hamano <gitster@pobox.com>2009-09-07 15:45:13 -0700
commit90e431152e05d3e8eb80a0db2e81b7cf50ecc745 (patch)
tree82655fe0a7418c71205548aad6725981d5436563
parent6d71c1dca4396de545a6c9667b3dcf0c03e42b30 (diff)
downloadgit-90e431152e05d3e8eb80a0db2e81b7cf50ecc745.tar.gz
git-90e431152e05d3e8eb80a0db2e81b7cf50ecc745.tar.xz
git-pull: do not mention --quiet and --verbose twice
git-pull.txt includes fetch-options.txt and merge-options.txt, both of which document the --quiet and --verbose. Supress the ones from fetch-options.txt. Signed-off-by: Emmanuel Trillaud <etrillaud@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/fetch-options.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/fetch-options.txt b/Documentation/fetch-options.txt
index ea3b1bc19..5eb2b0ee0 100644
--- a/Documentation/fetch-options.txt
+++ b/Documentation/fetch-options.txt
@@ -1,3 +1,4 @@
+ifndef::git-pull[]
-q::
--quiet::
Pass --quiet to git-fetch-pack and silence any other internally
@@ -6,6 +7,7 @@
-v::
--verbose::
Be verbose.
+endif::git-pull[]
-a::
--append::