| commit | 84f3de28baf6fc6a91b95fad9a4c5468dec3ea8e | |
| author | Paul Tan <pyokagan@gmail.com> | |
| Tue, 4 Aug 2015 13:51:41 +0000 (4 21:51 +0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 5 Aug 2015 05:02:11 +0000 (4 22:02 -0700) | ||
| tree | 37f5cfeb6089582b898d0ae61a54aab323c0bc3c | treesnapshot (tar.gz zip) |
| parent | d23a5117f821b91e1d72745238a4c085a089864e | commitdiff |
builtin-am: implement --3way
Since d1c5f2a (Add git-am, applymbox replacement., 2005-10-07),
git-am.sh supported the --3way option, and if set, would attempt to do a
3-way merge if the initial patch application fails.
Since 5d86861 (am -3: list the paths that needed 3-way fallback,
2012-03-28), in a 3-way merge git-am.sh would list the paths that needed
3-way fallback, so that the user can review them more carefully to spot
mismerges.
Re-implement the above in builtin/am.c.
Signed-off-by: Paul Tan <pyokagan@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Since d1c5f2a (Add git-am, applymbox replacement., 2005-10-07),
git-am.sh supported the --3way option, and if set, would attempt to do a
3-way merge if the initial patch application fails.
Since 5d86861 (am -3: list the paths that needed 3-way fallback,
2012-03-28), in a 3-way merge git-am.sh would list the paths that needed
3-way fallback, so that the user can review them more carefully to spot
mismerges.
Re-implement the above in builtin/am.c.
Signed-off-by: Paul Tan <pyokagan@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| builtin/am.c | diffblobblamehistory |