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 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html