![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Justin Frankel <justin@cockos.com> | |
| Thu, 26 Aug 2010 05:50:45 +0000 (00:50 -0500) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 26 Aug 2010 16:20:03 +0000 (09:20 -0700) | ||
| commit | 58a1ece478c6038a7eb0b6e494d563bd5e6d5978 | |
| tree | ea845e2862c6e9a713455c6108a85677b9d4e0ed | tree | snapshot |
| parent | 712516bcacacd45b4825ec649f15c3573f6fb42a | commit | diff |
merge-recursive --patience
Teach the merge-recursive strategy a --patience option to use the
"patience diff" algorithm, which tends to improve results when
cherry-picking a patch that reorders functions at the same time as
refactoring them.
To support this, struct merge_options and ll_merge_options gain an
xdl_opts member, so programs can use arbitrary xdiff flags (think
"XDF_IGNORE_WHITESPACE") in a git-aware merge.
git merge and git rebase can be passed the -Xpatience option to
use this.
[jn: split from --ignore-space patch; with documentation]
Signed-off-by: Justin Frankel <justin@cockos.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Teach the merge-recursive strategy a --patience option to use the
"patience diff" algorithm, which tends to improve results when
cherry-picking a patch that reorders functions at the same time as
refactoring them.
To support this, struct merge_options and ll_merge_options gain an
xdl_opts member, so programs can use arbitrary xdiff flags (think
"XDF_IGNORE_WHITESPACE") in a git-aware merge.
git merge and git rebase can be passed the -Xpatience option to
use this.
[jn: split from --ignore-space patch; with documentation]
Signed-off-by: Justin Frankel <justin@cockos.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>