summaryrefslogtreecommitdiff
path: root/builtin/merge-recursive.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 /builtin/merge-recursive.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 'builtin/merge-recursive.c')
-rw-r--r--builtin/merge-recursive.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/builtin/merge-recursive.c b/builtin/merge-recursive.c
index 5a52f3d..70e1d25 100644
--- a/builtin/merge-recursive.c
+++ b/builtin/merge-recursive.c
@@ -2,6 +2,7 @@
#include "commit.h"
#include "tag.h"
#include "merge-recursive.h"
+#include "xdiff-interface.h"
static const char *better_branch_name(const char *branch)
{