{"thread":{"id":"33390","subject":"[PATCH] git-merge(1): document diff-algorithm option to merge-recursive","startedAt":"2013-04-05T11:37:30Z","lastAt":"2013-04-05T11:37:30Z","messageCount":1,"participants":["John Keeping"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"213258","messageId":"8caba965bddcffd75972c730985b04a1eef3744e.1365161840.git.john@keeping.me.uk","threadId":"33390","inReplyTo":null,"subject":"[PATCH] git-merge(1): document diff-algorithm option to merge-recursive","fromName":"John Keeping","fromEmail":"john@keeping.me.uk","sentAt":"2013-04-05T11:37:30Z","receivedAt":"2013-04-05T11:37:30Z","isPatch":true,"sender":{"key":"john@keeping.me.uk","avatar":"https://avatars.githubusercontent.com/u/1702081?v=4"},"body":"Commit 07924d4 (diff: Introduce --diff-algorithm command line option\n2013-01-16) added diff-algorithm as a parameter to the recursive merge\nstrategy but did not document it.  Do so.\n\nSigned-off-by: John Keeping <john@keeping.me.uk>\n---\n Documentation/merge-strategies.txt | 6 ++++++\n 1 file changed, 6 insertions(+)\n\ndiff --git a/Documentation/merge-strategies.txt b/Documentation/merge-strategies.txt\nindex 66db802..49a9a7d 100644\n--- a/Documentation/merge-strategies.txt\n+++ b/Documentation/merge-strategies.txt\n@@ -48,6 +48,12 @@ patience;;\n \tthis when the branches to be merged have diverged wildly.\n \tSee also linkgit:git-diff[1] `--patience`.\n \n+diff-algorithm=[patience|minimal|histogram|myers];;\n+\tTells 'merge-recursive' to use a different diff algorithm, which\n+\tcan help avoid mismerges that occur due to unimportant matching\n+\tlines (such as braces from distinct functions).  See also\n+\tlinkgit:git-diff[1] `--diff-algorithm`.\n+\n ignore-space-change;;\n ignore-all-space;;\n ignore-space-at-eol;;\n-- \n1.8.2.540.gf023cfe\n"}]}