From: Junio C Hamano <junkio@cox.net>
Date: Sun, 27 May 2007 01:53:22 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.5.3-rc0~195
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c56ed464b0ba275d9f2e3598c61b391e98fc217b;p=git.git

Merge branch 'maint'

* maint:
  Fix git-svn to handle svn not reporting the md5sum of a file, and test.
  Fix mishandling of $Id$ expanded in the repository copy in convert.c
  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
---

c56ed464b0ba275d9f2e3598c61b391e98fc217b