* [PATCH] git-pull: fix fetch-options.txt to not document --quiet and --verbose twice
@ 2009-08-08 10:09 Emmanuel Trillaud
0 siblings, 0 replies; only message in thread
From: Emmanuel Trillaud @ 2009-08-08 10:09 UTC (permalink / raw)
To: git
git-pull.txt includes fetch-options.txt and merge-options.txt which both
document the --quiet and --verbose parameters. So we supress the
--quiet and --verbose paragraphs if fetch-options.txt is included by
git-pull.txt
---
Documentation/fetch-options.txt | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/Documentation/fetch-options.txt b/Documentation/fetch-options.txt
index d313795..525ce88 100644
--- a/Documentation/fetch-options.txt
+++ b/Documentation/fetch-options.txt
@@ -1,3 +1,6 @@
+//git-pull.txt includes merge-options.txt which documents --quiet and
+//--verbose
+ifndef::git-pull[]
-q::
--quiet::
Pass --quiet to git-fetch-pack and silence any other internally
@@ -6,6 +9,7 @@
-v::
--verbose::
Be verbose.
+endif::git-pull[]
-a::
--append::
--
1.6.4
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2009-08-08 10:10 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-08-08 10:09 [PATCH] git-pull: fix fetch-options.txt to not document --quiet and --verbose twice Emmanuel Trillaud
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.