| commit | 5d86861c925f15676a14b54062725eb11a85ffbc | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 28 Mar 2012 16:55:21 +0000 (28 09:55 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 28 Mar 2012 17:20:33 +0000 (28 10:20 -0700) | ||
| tree | 470e0edf80bdb355961d95ff37e4c333a5cdb701 | treesnapshot (tar.gz zip) |
| parent | 6c15a1c63634005a0f8fb15696e154cc54b0a359 | commitdiff |
am -3: list the paths that needed 3-way fallback
When applying a patch that was based on an older release with "am -3", I
often wonder changes to which files need to be reviewed with extra care to
spot mismerges, but there is no good indication.
The paths that needed 3-way fallback can easily be obtained by comparing
the synthesized (partial) base tree and the current HEAD and noticing only
additions and modifications (removals only show the sparseness of the fake
ancestor tree, which is not useful information at all). List them in the
usual --name-status format.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
When applying a patch that was based on an older release with "am -3", I
often wonder changes to which files need to be reviewed with extra care to
spot mismerges, but there is no good indication.
The paths that needed 3-way fallback can easily be obtained by comparing
the synthesized (partial) base tree and the current HEAD and noticing only
additions and modifications (removals only show the sparseness of the fake
ancestor tree, which is not useful information at all). List them in the
usual --name-status format.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| git-am.sh | diffblobblamehistory |