git.99rst.org Git - git.git/commitdiff

git.99rst.org / git.git / commitdiff

summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9b1c2a3 539e750)

author	Junio C Hamano <redacted>
	Mon, 21 Jul 2014 18:18:46 +0000 (11:18 -0700)
committer	Junio C Hamano <redacted>
	Mon, 21 Jul 2014 18:18:46 +0000 (11:18 -0700)

* ek/alt-odb-entry-fix:
sha1_file: do not add own object directory as alternate

		1	2
sha1_file.c	patch \|	diff1 \|	diff2 \|	blob \| history

Simple merge

git clone https://git.99rst.org/PROJECT