opendev/gerrit
Code Issues Proposed changes

Merge "Update description of core.useRecursiveMerge"

Browse Source
This commit is contained in:
Edwin Kempin
2014-07-16 05:23:04 +00:00
committed by Gerrit Code Review
parent 400e537ea2 71831d2707
commit a8747bab1a
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Documentation/config-gerrit.txt
View File

@@ -1095,9 +1095,13 @@ Default is 64 entries.
[[core.useRecursiveMerge]]core.useRecursiveMerge::
+
Use JGit's new, experimental recursive merger for three-way merges.
This only affects projects configured to automatically resolve
conflicts.
Use JGit's recursive merger for three-way merges. This only affects
projects configured to automatically resolve conflicts.
+
As explained in this
link:http://codicesoftware.blogspot.com/2011/09/merge-recursive-strategy.html[
blog], the recursive merge produces better results if the two commits
that are merged have more than one common predecessor.
+
Default is false, but in a future release may default to true.