diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-12-19 19:33:56 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-12-19 19:33:56 (GMT) |
| commit | d7c6c2369ac21141b7c6cceaebc6414ec3da14ad (patch) | |
| tree | 9aa0b15668a5bffa1f05e766eebab1d3cbafb380 /Documentation | |
| parent | 6d2c4619a59d53325e6de2265205c407767bde9d (diff) | |
| parent | 2477ab2ea8651920a9909f6d05b15ad9004a6c64 (diff) | |
| download | git-d7c6c2369ac21141b7c6cceaebc6414ec3da14ad.zip git-d7c6c2369ac21141b7c6cceaebc6414ec3da14ad.tar.gz git-d7c6c2369ac21141b7c6cceaebc6414ec3da14ad.tar.bz2 | |
Merge branch 'jt/diff-anchored-patience'
"git diff" learned a variant of the "--patience" algorithm, to
which the user can specify which 'unique' line to be used as
anchoring points.
* jt/diff-anchored-patience:
diff: support anchoring line(s)
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/diff-options.txt | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index 3c93c21..9d1586b 100644 --- a/Documentation/diff-options.txt +++ b/Documentation/diff-options.txt @@ -80,6 +80,16 @@ endif::git-format-patch[] --histogram:: Generate a diff using the "histogram diff" algorithm. +--anchored=<text>:: + Generate a diff using the "anchored diff" algorithm. ++ +This option may be specified more than once. ++ +If a line exists in both the source and destination, exists only once, +and starts with this text, this algorithm attempts to prevent it from +appearing as a deletion or addition in the output. It uses the "patience +diff" algorithm internally. + --diff-algorithm={patience|minimal|histogram|myers}:: Choose a diff algorithm. The variants are as follows: + |