summaryrefslogtreecommitdiff
path: root/ll-merge.c
diff options
context:
space:
mode:
authorJustin Frankel <justin@cockos.com>2010-08-26 05:50:45 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-08-26 16:20:03 (GMT)
commit58a1ece478c6038a7eb0b6e494d563bd5e6d5978 (patch)
treeea845e2862c6e9a713455c6108a85677b9d4e0ed /ll-merge.c
parent712516bcacacd45b4825ec649f15c3573f6fb42a (diff)
downloadgit-58a1ece478c6038a7eb0b6e494d563bd5e6d5978.zip
git-58a1ece478c6038a7eb0b6e494d563bd5e6d5978.tar.gz
git-58a1ece478c6038a7eb0b6e494d563bd5e6d5978.tar.bz2
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>
Diffstat (limited to 'll-merge.c')
-rw-r--r--ll-merge.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/ll-merge.c b/ll-merge.c
index 4d8e321..007dd3e 100644
--- a/ll-merge.c
+++ b/ll-merge.c
@@ -86,6 +86,7 @@ static int ll_xdl_merge(const struct ll_merge_driver *drv_unused,
memset(&xmp, 0, sizeof(xmp));
xmp.level = XDL_MERGE_ZEALOUS;
xmp.favor = opts->variant;
+ xmp.xpp.flags = opts->xdl_opts;
if (git_xmerge_style >= 0)
xmp.style = git_xmerge_style;
if (marker_size > 0)