projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: a970e84) | patch
Use merge-recursive in git-am -3.
authorShawn O. Pearce <spearce@spearce.org>
Thu, 28 Dec 2006 07:35:27 +0000 (02:35 -0500)
committerJunio C Hamano <junkio@cox.net>
Fri, 29 Dec 2006 03:06:16 +0000 (19:06 -0800)
commit579c9bb1986005282e049c6ad8f594a1ffc35fba
treed3e6cf85e05a1193525a2563312acc70b259a8aetree | snapshot
parenta970e84e8ad23a740e456fb4191ed61becef8989commit | diff
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>
git-am.sh diff | blob | history
Git—the stupid content tracker