diff options
| author |  Shawn O. Pearce <spearce@spearce.org> | 2006-12-28 02:35:27 -0500 |
|---|---|---|
| committer |  Junio C Hamano <junkio@cox.net> | 2006-12-28 19:06:16 -0800 |
| commit | 579c9bb1986005282e049c6ad8f594a1ffc35fba (patch) | |
| tree | d3e6cf85e05a1193525a2563312acc70b259a8ae /builtin-ls-files.c | |
| parent | Allow merging bare trees in merge-recursive. (diff) | |
| download | tgif-579c9bb1986005282e049c6ad8f594a1ffc35fba.tar.xz | |
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>
Diffstat (limited to 'builtin-ls-files.c')
0 files changed, 0 insertions, 0 deletions