Merge branch 'jk/maint-push-progress' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 10 May 2012 17:08:54 +0000 (10:08 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 10 May 2012 17:08:54 +0000 (10:08 -0700)
"git push" over smart-http lost progress output a few releases ago.

By Jeff King
* jk/maint-push-progress:
  t5541: test more combinations of --progress
  teach send-pack about --[no-]progress
  send-pack: show progress when isatty(2)

1  2 
remote-curl.c
t/t5541-http-push.sh

diff --cc remote-curl.c
Simple merge
Simple merge