From: Junio C Hamano <junkio@cox.net>
Date: Sat, 26 May 2007 08:30:40 +0000 (-0700)
Subject: Merge branch 'maint-1.5.1' into maint
X-Git-Tag: v1.5.2.1~13
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=d1c7c27ea3d9c92be2c7a9c5fc72ba5f228c424a;p=git.git

Merge branch 'maint-1.5.1' into maint

* maint-1.5.1:
  Fix git-svn to handle svn not reporting the md5sum of a file, and test.
  More echo "$user_message" fixes.
  Add tests for the last two fixes.
  git-commit: use printf '%s\n' instead of echo on user-supplied strings
  git-am: use printf instead of echo on user-supplied strings
  Documentation: Add definition of "evil merge" to GIT Glossary
  Replace the last 'dircache's by 'index'
  Documentation: Clean up links in GIT Glossary
---

d1c7c27ea3d9c92be2c7a9c5fc72ba5f228c424a