tokkee.org

Code

projects / git.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 4bcb310 ae72f68)

author	Junio C Hamano <junkio@cox.net>
	Wed, 27 Dec 2006 10:43:46 +0000 (02:43 -0800)
committer	Junio C Hamano <junkio@cox.net>
	Wed, 27 Dec 2006 10:43:46 +0000 (02:43 -0800)
commit	37818d7db070f67a20df58ac7d5e04cc63ef1867
tree	1b1b2b71afab1c4ad29666f56fa8d2560b7855c6	tree \| snapshot
parent	4bcb310c2539b66d535e87508d1b7a90fe29c083	commit \| diff
parent	ae72f685418b79bbd67e1017c5b1ac7d731c042e	commit \| diff

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	diff1 \|	diff2 \|	blob \| history
commit.c	diff1 \|	diff2 \|	blob \| history
commit.h	diff1 \|	diff2 \|	blob \| history
fetch-pack.c	diff1 \|	diff2 \|	blob \| history
git-clone.sh	diff1 \|	diff2 \|	blob \| history
git-fetch.sh	diff1 \|	diff2 \|	blob \| history
t/t5500-fetch-pack.sh	diff1 \|	diff2 \|	blob \| history
upload-pack.c	diff1 \|	diff2 \|	blob \| history

Git - the stupid content tracker