path: root/Documentation/merge-strategies.txt
diff options
authorJustin Frankel <>2010-08-26 05:50:45 (GMT)
committerJunio C Hamano <>2010-08-26 16:20:03 (GMT)
commit58a1ece478c6038a7eb0b6e494d563bd5e6d5978 (patch)
treeea845e2862c6e9a713455c6108a85677b9d4e0ed /Documentation/merge-strategies.txt
parent712516bcacacd45b4825ec649f15c3573f6fb42a (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 <> Signed-off-by: Jonathan Nieder <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to 'Documentation/merge-strategies.txt')
1 files changed, 7 insertions, 0 deletions
diff --git a/Documentation/merge-strategies.txt b/Documentation/merge-strategies.txt
index 049313d..a5ae14f 100644
--- a/Documentation/merge-strategies.txt
+++ b/Documentation/merge-strategies.txt
@@ -40,6 +40,13 @@ the other tree did, declaring 'our' history contains all that happened in it.
This is opposite of 'ours'.
+ With this option, 'merge-recursive' spends a little extra time
+ to avoid mismerges that sometimes occur due to unimportant
+ matching lines (e.g., braces from distinct functions). Use
+ this when the branches to be merged have diverged wildly.
+ See also linkgit:git-diff[1] `--patience`.
This runs a virtual check-out and check-in of all three stages
of a file when resolving a three-way merge. This option is