diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-12-19 01:10:13 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-12-19 01:10:13 +0300 |
| commit | 78956864b095fb8f9336c46c2573d28cd6ee601e (patch) | |
| tree | 7e56400ac44a30a34e5dd897cd5bca2bd073dc65 /Documentation | |
| parent | cacf27bf8229412ec48a572e42ba06e9c7e751a9 (diff) | |
| parent | 4f7fd79e57f483282bc21bf5b0669f9c8229d32a (diff) | |
Merge branch 'ad/merge-file-diff-algo'
"git merge-file" learned to take the "--diff-algorithm" option to
use algorithm different from the default "myers" diff.
* ad/merge-file-diff-algo:
merge-file: add --diff-algorithm option
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-merge-file.txt | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/git-merge-file.txt b/Documentation/git-merge-file.txt index 6a081eacb7..71915a00fa 100644 --- a/Documentation/git-merge-file.txt +++ b/Documentation/git-merge-file.txt @@ -92,6 +92,12 @@ object store and the object ID of its blob is written to standard output. Instead of leaving conflicts in the file, resolve conflicts favouring our (or their or both) side of the lines. +--diff-algorithm={patience|minimal|histogram|myers}:: + Use a different diff algorithm while merging. The current default is "myers", + but selecting more recent algorithm such as "histogram" can help + avoid mismerges that occur due to unimportant matching lines + (such as braces from distinct functions). See also + linkgit:git-diff[1] `--diff-algorithm`. EXAMPLES -------- |