Andrew's git - gitweb.git/diff

author	Junio C Hamano <gitster@pobox.com>
author	Sun, 24 Feb 2008 18:01:19 +0000 (10:01 -0800)
committer	Junio C Hamano <gitster@pobox.com>
committer	Sun, 24 Feb 2008 18:01:19 +0000 (10:01 -0800)

* maint:
Protect peel_ref fallback case from NULL parse_object result
Ensure 'make dist' compiles git-archive.exe on Cygwin

		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history

Simple merge