![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 23 Sep 2011 21:11:18 +0000 (14:11 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 23 Sep 2011 21:11:18 +0000 (14:11 -0700) | ||
| commit | 40ffc49876611150104102d59a35d865e4670bd7 | |
| tree | e341ca0e53f3824c2ab8d8a2dd2ef6fe6a7330d3 | tree | snapshot |
| parent | e622f41dcd97861796c7529712170f9eae07dc56 | commit | diff |
| parent | dff4b0ef30cd3f06e1f2383ce09f81b8da94d5b3 | commit | diff |
Merge branch 'gb/maint-am-patch-format-error-message' into maint
* gb/maint-am-patch-format-error-message:
am: format is in $patch_format, not parse_patch
* gb/maint-am-patch-format-error-message:
am: format is in $patch_format, not parse_patch
| git-am.sh | diff1 | | diff2 | | blob | history |