summaryrefslogtreecommitdiff
path: root/Documentation/git-pull.txt
diff options
context:
space:
mode:
authorTay Ray Chuan <rctay89@gmail.com>2010-02-24 12:50:28 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-02-24 16:35:45 (GMT)
commit9839018e874d4f15e820e1272f1ac575186c4fdc (patch)
tree5de72f32c6cf95ef5a87a6c8043ac3a9caf157cc /Documentation/git-pull.txt
parent7838106925653e02b5c00ccb47a240c4c837c0f6 (diff)
downloadgit-9839018e874d4f15e820e1272f1ac575186c4fdc.zip
git-9839018e874d4f15e820e1272f1ac575186c4fdc.tar.gz
git-9839018e874d4f15e820e1272f1ac575186c4fdc.tar.bz2
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/git-pull.txt')
-rw-r--r--Documentation/git-pull.txt4
1 files changed, 3 insertions, 1 deletions
diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt
index d47f9dd..ab4de10 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::