Code

Merge branch 'tc/transport-verbosity'
authorJunio C Hamano <gitster@pobox.com>
Mon, 15 Mar 2010 07:58:42 +0000 (00:58 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 15 Mar 2010 07:58:42 +0000 (00:58 -0700)
commit53997a30f8138f41d1d9c7a45e84106cc21c0558
tree656769918ccf2ffce554de623edb4a24e990d89e
parent66bce02ec459123d07c3f0230906cc2f8e36504c
parent212cfe157effe53537ec42f156fbf7415441efd0
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
Documentation/git-clone.txt
Documentation/git-push.txt
builtin/clone.c
builtin/fetch.c
builtin/push.c
transport-helper.c
transport.c
transport.h