From 58a1ece478c6038a7eb0b6e494d563bd5e6d5978 Mon Sep 17 00:00:00 2001 From: Justin Frankel Date: Thu, 26 Aug 2010 00:50:45 -0500 Subject: 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 Signed-off-by: Jonathan Nieder Signed-off-by: Junio C Hamano --- ll-merge.h | 1 + 1 file changed, 1 insertion(+) (limited to 'll-merge.h') diff --git a/ll-merge.h b/ll-merge.h index 4b707f06c..244a31f55 100644 --- a/ll-merge.h +++ b/ll-merge.h @@ -9,6 +9,7 @@ struct ll_merge_options { unsigned virtual_ancestor : 1; unsigned variant : 2; /* favor ours, favor theirs, or union merge */ unsigned renormalize : 1; + long xdl_opts; }; int ll_merge(mmbuffer_t *result_buf, -- cgit v1.2.1