Merge branch 'master' into js/shallow
authorJunio C Hamano <junkio@cox.net>
Wed, 27 Dec 2006 10:43:46 +0000 (02:43 -0800)
committerJunio C Hamano <junkio@cox.net>
Wed, 27 Dec 2006 10:43:46 +0000 (02:43 -0800)
commit37818d7db070f67a20df58ac7d5e04cc63ef1867
tree1b1b2b71afab1c4ad29666f56fa8d2560b7855c6
parent4bcb310c2539b66d535e87508d1b7a90fe29c083
parentae72f685418b79bbd67e1017c5b1ac7d731c042e
Merge branch 'master' into js/shallow

This is to adjust to:

  count-objects -v: show number of packs as well.

which will break a test in this series.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Makefile
commit.c
commit.h
fetch-pack.c
git-clone.sh
git-fetch.sh
t/t5500-fetch-pack.sh
upload-pack.c