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

diff --cc cache-tree.c
Simple merge

diff --cc t/t5516-fetch-push.sh
Simple merge