From: Junio C Hamano <junkio@cox.net>
Date: Tue, 2 May 2006 23:22:11 +0000 (-0700)
Subject: Merge branch 'master' into next
X-Git-Tag: v1.4.1-rc1~145
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6a40327d242dac9f85c6d63c94d537b45ba86e89;p=git.git

Merge branch 'master' into next

* master:
  git-send-email: fix version string to be valid perl
  Give the user a hint for how to continue in the case that git-am fails because it requires user intervention
  repo-config: trim white-space before comment
  repo-config: fix segfault with no argument.
---

6a40327d242dac9f85c6d63c94d537b45ba86e89