git.tremily.us Git - git.git/commit

Merge branch 'sp/maint-push-sideband' into sp/push-sideband

* sp/maint-push-sideband:
  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
  Update git fsck --full short description to mention packs

Conflicts:
run-command.c

author	Junio C Hamano <gitster@pobox.com>
	Sat, 6 Feb 2010 05:08:53 +0000 (21:08 -0800)
committer	Junio C Hamano <gitster@pobox.com>
	Sat, 6 Feb 2010 05:08:53 +0000 (21:08 -0800)
commit	76d44c8cfda9be1db78884580ab045c421b083fe
tree	9ac31805cf463c84b0bd097e5246a1711181323b	tree \| snapshot
parent	b0883aa6c77111e88496bd0afe073caf68ab9f99	commit \| diff
parent	6d525d389fbef814b11e41f196e6656f2e95f412	commit \| diff

builtin-receive-pack.c	diff1 \|	diff2 \|	blob \| history
builtin-send-pack.c	diff1 \|	diff2 \|	blob \| history
convert.c	diff1 \|	diff2 \|	blob \| history
remote-curl.c	diff1 \|	diff2 \|	blob \| history
run-command.c	diff1 \|	diff2 \|	blob \| history
run-command.h	diff1 \|	diff2 \|	blob \| history
t/t5401-update-hooks.sh	diff1 \|	diff2 \|	blob \| history