![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 5 Mar 2012 07:35:12 +0000 (23:35 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 5 Mar 2012 07:35:12 +0000 (23:35 -0800) | ||
| commit | 250f0a074a0bf7194c6a99c481211b0c9d8590a7 | |
| tree | a7713bccac0041d6409dee8d7bc95527dff77dab | tree | snapshot |
| parent | 91527e54d565e6fb6910fb3cb22f5915b5bd346e | commit | diff |
| parent | a61ba26a4725d4a93297305315587b92324baf0b | commit | diff |
Merge branch 'jc/am-3-nonstandard-popt'
* jc/am-3-nonstandard-popt:
test: "am -3" can accept non-standard -p<num>
am -3: allow nonstandard -p<num> option
* jc/am-3-nonstandard-popt:
test: "am -3" can accept non-standard -p<num>
am -3: allow nonstandard -p<num> option
| git-am.sh | diff1 | | diff2 | | blob | history |
| t/t4150-am.sh | diff1 | | diff2 | | blob | history |