From 58a1ece478c6038a7eb0b6e494d563bd5e6d5978 Mon Sep 17 00:00:00 2001 From: Justin Frankel Date: Thu, 26 Aug 2010 00:50:45 -0500 Subject: 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 --- Documentation/merge-strategies.txt | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'Documentation/merge-strategies.txt') 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 -- cgit v1.2.3 From 4e5dd044c62f2a82de083e7cd46cad7b0d3465ae Mon Sep 17 00:00:00 2001 From: Justin Frankel Date: Thu, 26 Aug 2010 00:51:47 -0500 Subject: merge-recursive: options to ignore whitespace changes Add support for merging with ignoring line endings (specifically --ignore-space-at-eol) when using recursive merging. This is as a strategy-option, so that you can do: git merge --strategy-option=ignore-space-at-eol and git rebase --strategy-option=ignore-space-at-eol This can be useful for coping with line-ending damage (Xcode 3.1 has a nasty habit of converting all CRLFs to LFs, and VC6 tends to just use CRLFs for inserted lines). The only option I need is ignore-space-at-eol, but while at it, include the other xdiff whitespace options (ignore-space-change, ignore-all-space), too. [jn: with documentation] Signed-off-by: Justin Frankel Signed-off-by: Jonathan Nieder Signed-off-by: Junio C Hamano --- Documentation/merge-strategies.txt | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'Documentation/merge-strategies.txt') diff --git a/Documentation/merge-strategies.txt b/Documentation/merge-strategies.txt index a5ae14fba5..91faba5da9 100644 --- a/Documentation/merge-strategies.txt +++ b/Documentation/merge-strategies.txt @@ -47,6 +47,21 @@ patience;; this when the branches to be merged have diverged wildly. See also linkgit:git-diff[1] `--patience`. +ignore-space-change;; +ignore-all-space;; +ignore-space-at-eol;; + 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. + 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 -- cgit v1.2.3