git.tremily.us Git - git.git/commit

projects / git.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: bf0fe35 2c626e5)

author	Junio C Hamano <gitster@pobox.com>
	Sun, 22 Mar 2009 05:53:36 +0000 (22:53 -0700)
committer	Junio C Hamano <gitster@pobox.com>
	Sun, 22 Mar 2009 05:53:36 +0000 (22:53 -0700)
commit	2990034f1ed2c3d85d23d5611a1f04d317f785ac
tree	b279df7a87a679a74c942f1c32d42681f9317f4b	tree \| snapshot
parent	bf0fe35c938ac9f03d1369600b0c76e428a57507	commit \| diff
parent	2c626e5fa8a46f647b88fb32d7b28d573e8631bf	commit \| diff

Merge branch 'jc/maint-1.6.0-pack-directory' into maint-1.6.1

* jc/maint-1.6.0-pack-directory:
Fix odb_mkstemp() on AIX
Make sure objects/pack exists before creating a new pack

Conflicts:
wrapper.c

builtin-pack-objects.c	diff1 \|	diff2 \|	blob \| history
fast-import.c	diff1 \|	diff2 \|	blob \| history
git-compat-util.h	diff1 \|	diff2 \|	blob \| history
index-pack.c	diff1 \|	diff2 \|	blob \| history
pack-write.c	diff1 \|	diff2 \|	blob \| history
t/t5300-pack-object.sh	diff1 \|	diff2 \|	blob \| history
wrapper.c	diff1 \|	diff2 \|	blob \| history

Git—the stupid content tracker