| commit | 579c9bb1986005282e049c6ad8f594a1ffc35fba | |
| author | Shawn O. Pearce <spearce@spearce.org> | |
| Thu, 28 Dec 2006 07:35:27 +0000 (28 02:35 -0500) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Fri, 29 Dec 2006 03:06:16 +0000 (28 19:06 -0800) | ||
| tree | d3e6cf85e05a1193525a2563312acc70b259a8ae | treesnapshot (tar.gz zip) |
| parent | a970e84e8ad23a740e456fb4191ed61becef8989 | commitdiff |
Use merge-recursive in git-am -3.
By switching from merge-resolve to merge-recursive in the 3-way
fallback behavior of git-am we gain a few benefits:
* renames are automatically handled, like in rebase -m;
* conflict hunks can reference the patch name;
* its faster on Cygwin (less forks).
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
By switching from merge-resolve to merge-recursive in the 3-way
fallback behavior of git-am we gain a few benefits:
* renames are automatically handled, like in rebase -m;
* conflict hunks can reference the patch name;
* its faster on Cygwin (less forks).
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
| git-am.sh | diffblobblamehistory |