git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH resend] git-pull: fix fetch-options.txt to not document --quiet and --verbose twice in git-pull.txt

From
ETEmmanuel Trillaud <etrillaud@gmail.com>
Date
Sep 7, 2009, 12:34 UTC
Message-ID
<9f50533b0909070534q2375a793mf5d676b519eae69@mail.gmail.com>

Hello all, In git-pull(1) we can read :

OPTIONS
      -q, --quiet
          Operate quietly.
      -v, --verbose
          Be verbose.
...
      -q, --quiet
          Pass --quiet to git-fetch-pack and silence any other
internally used git
          commands.
      -v, --verbose
          Be verbose.

The first part is included by merge-option.txt and the second by fetch-options.txt. I choose to "suppress" the fetch-options part because IMHO we don't need that level of precision. But if you prefer, I can provide a patch to "ifndef" the merge-options.txt part.

Best regard

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

Signed-off-by: Emmanuel Trillaud <etrillaud@gmail.com>
---
Documentation/fetch-options.txt |    2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/Documentation/fetch-options.txt b/Documentation/fetch-options.txt
index ea3b1bc..5eb2b0e 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::
--
1.6.4.2.253.g0b1fac
Next: Junio C Hamano
Message 1 of 5 in “git-pull: fix fetch-options.txt to not document --quiet and --verbose twice in git-pull.txt”
  1. git-pull: fix fetch-options.txt to not document --quiet and --verbose twice in git-pull.txtEmmanuel Trillaud, Sep 7, 2009
  2. Junio C HamanoSep 7, 2009
  3. Junio C HamanoSep 7, 2009
  4. Matthieu MoySep 8, 2009
  5. Emmanuel TrillaudSep 8, 2009

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.