Merge branch 'maint'
commitdc31cd8fcc20d95a80da5ebe6feaab01539ebe4c
authorJunio C Hamano <gitster@pobox.com>
Sun, 24 Feb 2008 18:01:19 +0000 (24 10:01 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sun, 24 Feb 2008 18:01:19 +0000 (24 10:01 -0800)
tree3ae76ea0df2e0028d7ee5ebc032d805597c22978
parente85486450eb0407ad0449d0214b97506d452407f
parent8c87dc77ae45d7277001b1be2c88ea9062e11d72
Merge branch 'maint'

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