diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-03-15 00:58:42 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-03-15 00:58:42 -0700 |
| commit | 53997a30f8138f41d1d9c7a45e84106cc21c0558 (patch) | |
| tree | 656769918ccf2ffce554de623edb4a24e990d89e /Documentation/git-pull.txt | |
| parent | 66bce02ec459123d07c3f0230906cc2f8e36504c (diff) | |
| parent | 212cfe157effe53537ec42f156fbf7415441efd0 (diff) | |
| download | git-53997a30f8138f41d1d9c7a45e84106cc21c0558.tar.gz | |
Merge branch 'tc/transport-verbosity'
* tc/transport-verbosity:
transport: update flags to be in running order
fetch and pull: learn --progress
push: learn --progress
transport->progress: use flag authoritatively
clone: support multiple levels of verbosity
push: support multiple levels of verbosity
fetch: refactor verbosity option handling into transport.[ch]
Documentation/git-push: put --quiet before --verbose
Documentation/git-pull: put verbosity options before merge/fetch ones
Documentation/git-clone: mention progress in -v
Conflicts:
transport.h
Diffstat (limited to 'Documentation/git-pull.txt')
| -rw-r--r-- | Documentation/git-pull.txt | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt index 31f42ea21a..ab4de10358 100644 --- a/Documentation/git-pull.txt +++ b/Documentation/git-pull.txt @@ -31,6 +31,16 @@ in a state that is hard to back out of in the case of a conflict. OPTIONS ------- +-q:: +--quiet:: + 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:: + Pass --verbose to git-fetch and git-merge. + Options related to merging ~~~~~~~~~~~~~~~~~~~~~~~~~~ |