| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 10 Feb 2010 18:00:49 +0000 (10:00 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 10 Feb 2010 18:00:49 +0000 (10:00 -0800) | ||
| commit | cc8eb6407e88a46da6d41e18cffed3878f2c53cf | |
| tree | 1f9d03f794d8d695c27ce60327c63b016e33fb71 | tree | snapshot |
| parent | 76d44c8cfda9be1db78884580ab045c421b083fe | commit | diff |
| parent | 466dbc42f58623d4341d6b1171b5cc13e2b700df | commit | diff |
Merge branch 'sp/maint-push-sideband' into sp/push-sideband
* sp/maint-push-sideband:
receive-pack: Send internal errors over side-band #2
t5401: Use a bare repository for the remote peer
Conflicts:
builtin-receive-pack.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
Conflicts:
builtin-receive-pack.c
t/t5401-update-hooks.sh
| builtin-receive-pack.c | diff1 | | diff2 | | blob | history |