diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-12-19 13:57:54 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-12-19 13:57:54 -0800 |
| commit | 047135e65db3686c7b168ba029e8545071e5226f (patch) | |
| tree | 8cb85350a565679c88d6d642189594081b64a38b /diff-options.txt | |
| parent | 005a1130228687694cfc3f028b25b6eea05dbbb2 (diff) | |
| download | git-htmldocs-047135e65db3686c7b168ba029e8545071e5226f.tar.gz | |
Autogenerated HTML docs for v2.15.1-433-g936d1
Diffstat (limited to 'diff-options.txt')
| -rw-r--r-- | diff-options.txt | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/diff-options.txt b/diff-options.txt index 3c93c2168..9d1586b95 100644 --- a/diff-options.txt +++ b/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: + |