author | Junio C Hamano <gitster@pobox.com> | |
Mon, 15 Mar 2010 07:58:42 +0000 (00:58 -0700) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Mon, 15 Mar 2010 07:58:42 +0000 (00:58 -0700) | ||
commit | 53997a30f8138f41d1d9c7a45e84106cc21c0558 | |
tree | 656769918ccf2ffce554de623edb4a24e990d89e | tree | snapshot |
parent | 66bce02ec459123d07c3f0230906cc2f8e36504c | commit | diff |
parent | 212cfe157effe53537ec42f156fbf7415441efd0 | commit | diff |
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
* 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
Documentation/git-clone.txt | diff1 | | diff2 | | blob | history |
Documentation/git-push.txt | diff1 | | diff2 | | blob | history |
builtin/clone.c | diff1 | | | | blob | history |
builtin/fetch.c | diff1 | | | | blob | history |
builtin/push.c | diff1 | | | | blob | history |
transport-helper.c | diff1 | | diff2 | | blob | history |
transport.c | diff1 | | diff2 | | blob | history |
transport.h | diff1 | | diff2 | | blob | history |