diff options
| author |  Tay Ray Chuan <rctay89@gmail.com> | 2010-02-24 20:50:28 +0800 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2010-02-24 08:35:45 -0800 |
| commit | 9839018e874d4f15e820e1272f1ac575186c4fdc (patch) | |
| tree | 5de72f32c6cf95ef5a87a6c8043ac3a9caf157cc /Documentation | |
| parent | push: learn --progress (diff) | |
| download | tgif-9839018e874d4f15e820e1272f1ac575186c4fdc.tar.xz | |
fetch and pull: learn --progress
Note that in the documentation for git-pull, documentation for the
--progress option is displayed under the "Options related to fetching"
subtitle via fetch-options.txt.
Also, update the documentation of the -q/--quiet option for git-pull to
mention its effect on progress reporting during fetching.
Signed-off-by: Tay Ray Chuan <rctay89@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/fetch-options.txt | 9 | ||||
| -rw-r--r-- | Documentation/git-pull.txt | 4 |
2 files changed, 11 insertions, 2 deletions
diff --git a/Documentation/fetch-options.txt b/Documentation/fetch-options.txt index fe716b2e42..044ec882cc 100644 --- a/Documentation/fetch-options.txt +++ b/Documentation/fetch-options.txt @@ -78,9 +78,16 @@ ifndef::git-pull[] -q:: --quiet:: Pass --quiet to git-fetch-pack and silence any other internally - used git commands. + used git commands. Progress is not reported to the standard error + stream. -v:: --verbose:: Be verbose. endif::git-pull[] + +--progress:: + Progress status is reported on the standard error stream + by default when it is attached to a terminal, unless -q + is specified. This flag forces progress status even if the + standard error stream is not directed to a terminal. diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt index d47f9ddd89..ab4de10358 100644 --- a/Documentation/git-pull.txt +++ b/Documentation/git-pull.txt @@ -33,7 +33,9 @@ OPTIONS -q:: --quiet:: - Pass --quiet to git-fetch and git-merge. + This is passed to both underlying git-fetch to squelch reporting of + during transfer, and underlying git-merge to squelch output during + merging. -v:: --verbose:: |