Merge branch 'sp/push-sideband' into jch
authorJunio C Hamano <gitster@pobox.com>
Wed, 17 Feb 2010 07:02:43 +0000 (23:02 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 17 Feb 2010 07:02:43 +0000 (23:02 -0800)
commit6f19e5be870c9fbcf1df4bfe309b2eb4e8522e42
tree7d6745a100f5116cf08f26672e661ff23841de94
parente6ef1a8ed4098961e06eed3ff3add96d4f2474f6
parentcc8eb6407e88a46da6d41e18cffed3878f2c53cf
Merge branch 'sp/push-sideband' into jch

* sp/push-sideband:
  receive-pack: Send internal errors over side-band #2
  t5401: Use a bare repository for the remote peer
  receive-pack: Send hook output over side band #2
  receive-pack: Wrap status reports inside side-band-64k
  receive-pack: Refactor how capabilities are shown to the client
  send-pack: demultiplex a sideband stream with status data
  run-command: support custom fd-set in async
  run-command: Allow stderr to be a caller supplied pipe
Documentation/technical/api-run-command.txt