diff options
author | Junio C Hamano <gitster@pobox.com> | 2010-02-10 10:00:49 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2010-02-10 10:00:49 -0800 |
commit | cc8eb6407e88a46da6d41e18cffed3878f2c53cf (patch) | |
tree | 1f9d03f794d8d695c27ce60327c63b016e33fb71 /contrib/fast-import/git-p4 | |
parent | Merge branch 'sp/maint-push-sideband' into sp/push-sideband (diff) | |
parent | receive-pack: Send internal errors over side-band #2 (diff) | |
download | tgif-cc8eb6407e88a46da6d41e18cffed3878f2c53cf.tar.xz |
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
Diffstat (limited to 'contrib/fast-import/git-p4')
0 files changed, 0 insertions, 0 deletions