| commit | a886ba2801cbe0a4d6bbc34714cb09996dbcc127 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 3 Mar 2010 06:54:50 +0000 (2 22:54 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 3 Mar 2010 06:54:50 +0000 (2 22:54 -0800) | ||
| tree | 54617f7bba6f1e1640145d10b6f662cc0111775c | treesnapshot (tar.gz zip) |
| parent | a625740aae48c0f08916e564bc11f49542d4fb48 | commitdiff |
| parent | 466dbc42f58623d4341d6b1171b5cc13e2b700df | commitdiff |
Merge branch 'sp/maint-push-sideband' into maint
* sp/maint-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
Conflicts:
builtin-receive-pack.c
run-command.c
t/t5401-update-hooks.sh
* sp/maint-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
Conflicts:
builtin-receive-pack.c
run-command.c
t/t5401-update-hooks.sh