Merge branch 'jc/am-3-nonstandard-popt'
commit250f0a074a0bf7194c6a99c481211b0c9d8590a7
authorJunio C Hamano <gitster@pobox.com>
Mon, 5 Mar 2012 07:35:12 +0000 (4 23:35 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 5 Mar 2012 07:35:12 +0000 (4 23:35 -0800)
treea7713bccac0041d6409dee8d7bc95527dff77dab
parent91527e54d565e6fb6910fb3cb22f5915b5bd346e
parenta61ba26a4725d4a93297305315587b92324baf0b
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
git-am.sh
t/t4150-am.sh