Merge branch 'maint-1.5.4' into maint
commit31c6390d40fe12a46c38d7224da61c6771886f2a
authorJunio C Hamano <gitster@pobox.com>
Fri, 25 Apr 2008 04:50:48 +0000 (24 21:50 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 25 Apr 2008 04:50:48 +0000 (24 21:50 -0700)
tree3856f02ce893c6254fcb0940ec57566ec385bb76
parent3ffb58be0a779b47e1e4d3ea584ba301461a3a77
parent3ef6a1fe95b0a5aaca21a86651850ef5d62327fa
Merge branch 'maint-1.5.4' into maint

* maint-1.5.4:
  t5516: remove ambiguity test (1)
  Linked glossary from cvs-migration page
  write-tree: properly detect failure to write tree objects
cache-tree.c
t/t5516-fetch-push.sh