summaryrefslogtreecommitdiff
path: root/compat
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-02-22 21:55:06 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-02-22 21:55:06 -0800
commit4056afbcf2d3ee3e9df2788656f3197cc363a2ee (patch)
treef97f9c6682faeb16ecc195ecd1727718aef2ad67 /compat
parentSync with 1.7.6.6 (diff)
downloadtgif-4056afbcf2d3ee3e9df2788656f3197cc363a2ee.tar.xz
am -3: allow nonstandard -p<num> option
When falling back to 3-way merge, we run "git apply" to synthesize the fake ancestor tree by parsing the incoming patch, and another "git apply" to apply the patch to the fake ancestor tree. Both invocation need to be aware of the custom -p<num> setting to parse patches that were prepared with non-standard src/dst prefix. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'compat')
0 files changed, 0 insertions, 0 deletions