Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Sun, 24 Feb 2008 18:01:19 +0000 (10:01 -0800)
committerJunio C Hamano <gitster@pobox.com>
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

diff --cc Makefile
Simple merge