![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 23 Feb 2012 05:55:06 +0000 (21:55 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 23 Feb 2012 05:55:06 +0000 (21:55 -0800) | ||
| commit | 4056afbcf2d3ee3e9df2788656f3197cc363a2ee | |
| tree | f97f9c6682faeb16ecc195ecd1727718aef2ad67 | tree | snapshot |
| parent | d0482e88a735787f7bb33ef4783be0e7f6a70946 | commit | diff |
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>
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>
| git-am.sh | diff | blob | history |