diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-03-02 22:54:50 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-03-02 22:54:50 -0800 |
| commit | a886ba2801cbe0a4d6bbc34714cb09996dbcc127 (patch) | |
| tree | 54617f7bba6f1e1640145d10b6f662cc0111775c /imap-send.c | |
| parent | a625740aae48c0f08916e564bc11f49542d4fb48 (diff) | |
| parent | 466dbc42f58623d4341d6b1171b5cc13e2b700df (diff) | |
| download | git-a886ba2801cbe0a4d6bbc34714cb09996dbcc127.tar.gz git-a886ba2801cbe0a4d6bbc34714cb09996dbcc127.tar.xz | |
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
Diffstat (limited to 'imap-send.c')
0 files changed, 0 insertions, 0 deletions