path: root/Documentation/merge-strategies.txt
diff options
authorJunio C Hamano <>2010-10-27 04:40:54 (GMT)
committerJunio C Hamano <>2010-10-27 04:40:54 (GMT)
commit75b17fee72a0f78e0ad31728771231f8b3ed4d56 (patch)
tree190461ec1fedaf1a3c5d5d7fc9201a5a6455a144 /Documentation/merge-strategies.txt
parent5a3a484d577d8612f729d64f3a069e63df07ec07 (diff)
parent4e5dd044c62f2a82de083e7cd46cad7b0d3465ae (diff)
Merge branch 'jf/merge-ignore-ws'
* jf/merge-ignore-ws: merge-recursive: options to ignore whitespace changes merge-recursive --patience ll-merge: replace flag argument with options struct merge-recursive: expose merge options for builtin merge
Diffstat (limited to 'Documentation/merge-strategies.txt')
1 files changed, 22 insertions, 0 deletions
diff --git a/Documentation/merge-strategies.txt b/Documentation/merge-strategies.txt
index 8676e26..9cf88e2 100644
--- a/Documentation/merge-strategies.txt
+++ b/Documentation/merge-strategies.txt
@@ -40,6 +40,28 @@ 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`.
+ Treats lines with the indicated type of whitespace change as
+ unchanged for the sake of a three-way merge. Whitespace
+ changes mixed with other changes to a line are not ignored.
+ See also linkgit:git-diff[1] `-b`, `-w`, and
+ `--ignore-space-at-eol`.
+* If 'their' version only introduces whitespace changes to a line,
+ 'our' version is used;
+* If 'our' version introduces whitespace changes but 'their'
+ version includes a substantial change, 'their' version is used;
+* Otherwise, the merge proceeds in the usual way.
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