From: Junio C Hamano <junkio@cox.net>
Date: Tue, 2 May 2006 22:05:34 +0000 (-0700)
Subject: Merge branch 'fix'
X-Git-Tag: v1.4.0-rc1~196
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=782b3b6aafe8d2d270a5f6153c183e1bde7a030a;p=git.git

Merge branch 'fix'

* fix:
  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
---

782b3b6aafe8d2d270a5f6153c183e1bde7a030a