Merge branch 'jc/am-3-nonstandard-popt' into next
commit1363bd66e35f2dcc03798d73a38785ca8ed2efaf
authorJunio C Hamano <gitster@pobox.com>
Mon, 27 Feb 2012 01:47:12 +0000 (26 17:47 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 27 Feb 2012 01:47:12 +0000 (26 17:47 -0800)
tree334810eb84541ee3d38ebfa5d7a3566c5816157f
parent00620085a3a6e09eba51ba80a1d22eabcc242cbc
parent4056afbcf2d3ee3e9df2788656f3197cc363a2ee
Merge branch 'jc/am-3-nonstandard-popt' into next

* jc/am-3-nonstandard-popt:
  am -3: allow nonstandard -p<num> option
git-am.sh