From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 28 Feb 2012 23:24:53 GMT
Subject: [PATCH 0/2] "am -3" and "--no-prefix" does not work well
Message-ID: <1330471495-12013-1-git-send-email-gitster@pobox.com>

I wrote these a few days ago when I tried to review somebody's patch
on this list that was made with "format-patch --no-prefix".  The regular
patch application without the three-way fallback was prepared to honor a
custom -p<num>, but the code to synthesize the fake ancestor tree forgot
to pay attention to -p<num>, so "am -3 -p0" was failing.

Junio C Hamano (2):
  am -3: allow nonstandard -p<num> option
  test: "am -3" can accept non-standard -p<num>

 git-am.sh     |   11 +++++++----
 t/t4150-am.sh |   15 +++++++++++++++
 2 files changed, 22 insertions(+), 4 deletions(-)

-- 
1.7.9.2.344.g3e8c86