diff options
| author | Justin Frankel <justin@cockos.com> | 2010-08-26 09:50:45 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-08-26 20:20:03 +0400 |
| commit | 58a1ece478c6038a7eb0b6e494d563bd5e6d5978 (patch) | |
| tree | ea845e2862c6e9a713455c6108a85677b9d4e0ed /Documentation/merge-strategies.txt | |
| parent | 712516bcacacd45b4825ec649f15c3573f6fb42a (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 <justin@cockos.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/merge-strategies.txt')
| -rw-r--r-- | Documentation/merge-strategies.txt | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Documentation/merge-strategies.txt b/Documentation/merge-strategies.txt index 049313d601..a5ae14fba5 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. theirs;; This is opposite of 'ours'. +patience;; + 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`. + renormalize;; 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 |