]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'jc/upload-corrupt'
authorJunio C Hamano <junkio@cox.net>
Thu, 22 Jun 2006 17:25:51 +0000 (10:25 -0700)
committerJunio C Hamano <junkio@cox.net>
Thu, 22 Jun 2006 17:25:51 +0000 (10:25 -0700)
* jc/upload-corrupt:
  daemon: send stderr to /dev/null instead of closing.
  upload-pack/fetch-pack: support side-band communication
  Retire git-clone-pack
  upload-pack: prepare for sideband message support.
  upload-pack: avoid sending an incomplete pack upon failure

1  2 
Makefile
daemon.c
pack-objects.c
pkt-line.c

diff --cc Makefile
Simple merge
diff --cc daemon.c
Simple merge
diff --cc pack-objects.c
Simple merge
diff --cc pkt-line.c
Simple merge