summaryrefslogtreecommitdiff
path: root/t/t7800-difftool.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2010-03-15 00:58:42 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-03-15 00:58:42 -0700
commit53997a30f8138f41d1d9c7a45e84106cc21c0558 (patch)
tree656769918ccf2ffce554de623edb4a24e990d89e /t/t7800-difftool.sh
parentMerge branch 'ld/push-porcelain' (diff)
parenttransport: update flags to be in running order (diff)
downloadtgif-53997a30f8138f41d1d9c7a45e84106cc21c0558.tar.xz
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 't/t7800-difftool.sh')
0 files changed, 0 insertions, 0 deletions