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

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

[Emmanuel Trillaud]

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

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

[Junio C Hamano]

The patch seems to be severely whitespace damaged the same way as in the
previous round.

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

[Junio C Hamano]

Emmanuel Trillaud <etrillaud@gmail.com> writes:

> I choose to "suppress" the fetch-options part because IMHO we don't need
> that level of precision.

I tried to see both versions myself and came to the same conclusion.
Thanks.

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

[Matthieu Moy]

Emmanuel Trillaud <etrillaud@gmail.com> writes:

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

[...]

> Best regard

I guess this part of your message is not meant to appear in the commit
message. If you leave it here, Junio will have to edit it manually,
whereas if you put it where Documentation/SubmitingPatches suggests,
i.e.

> ---

here (between --- and diffstat), it's done automatically. Be nice to
our maintainer, and our mainainer will be nice to you ;-).

> Documentation/fetch-options.txt |    2 ++
> 1 files changed, 2 insertions(+), 0 deletions(-)

-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/

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

[Emmanuel Trillaud]

Thank you for your patience. 
Because I want to be kind to our maintainer :-), I've just finish a
complete reading of SubmitingPatches. Next time I promise : no more
whistespace mess and a commit message were it is meant to be.

Best regards

Emmanuel Trillaud