Merge branch 'master' into next
authorJunio C Hamano <junkio@cox.net>
Tue, 2 May 2006 23:22:11 +0000 (16:22 -0700)
committerJunio C Hamano <junkio@cox.net>
Tue, 2 May 2006 23:22:11 +0000 (16:22 -0700)
* 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.

Trivial merge