![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <junkio@cox.net> | |
| Tue, 2 May 2006 23:22:11 +0000 (16:22 -0700) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Tue, 2 May 2006 23:22:11 +0000 (16:22 -0700) | ||
| commit | 6a40327d242dac9f85c6d63c94d537b45ba86e89 | |
| tree | 28172f8dafa4ddac3ee43a1884f31f2b26cc7afe | tree | snapshot |
| parent | fc71b89fb61fd2ca98dad481cc44671e7680f9ce | commit | diff |
| parent | 782b3b6aafe8d2d270a5f6153c183e1bde7a030a | commit | diff |
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.
* 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.