diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-11-08 10:33:21 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-11-08 10:33:21 -0800 |
| commit | 80027a591c95119a95a5c3fa827fcbe29369e011 (patch) | |
| tree | bc6ffd5aff4841be9bf5108e94127b84b5fbe16e /Documentation/diff-algorithm-option.adoc | |
| parent | Merge branch 'lo/repo-info-all' into seen (diff) | |
| parent | blame: make diff algorithm configurable (diff) | |
| download | git-80027a591c95119a95a5c3fa827fcbe29369e011.tar.gz git-80027a591c95119a95a5c3fa827fcbe29369e011.zip | |
Merge branch 'ad/blame-diff-algorithm' into seen
"git blame" learns "--diff-algorithm=<algo>" option.
* ad/blame-diff-algorithm:
blame: make diff algorithm configurable
xdiff: add 'minimal' to XDF_DIFF_ALGORITHM_MASK
Diffstat (limited to 'Documentation/diff-algorithm-option.adoc')
| -rw-r--r-- | Documentation/diff-algorithm-option.adoc | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/Documentation/diff-algorithm-option.adoc b/Documentation/diff-algorithm-option.adoc new file mode 100644 index 0000000000..8e3a0b63d7 --- /dev/null +++ b/Documentation/diff-algorithm-option.adoc @@ -0,0 +1,20 @@ +`--diff-algorithm=(patience|minimal|histogram|myers)`:: + Choose a diff algorithm. The variants are as follows: ++ +-- + `default`;; + `myers`;; + The basic greedy diff algorithm. Currently, this is the default. + `minimal`;; + Spend extra time to make sure the smallest possible diff is + produced. + `patience`;; + Use "patience diff" algorithm when generating patches. + `histogram`;; + This algorithm extends the patience algorithm to "support + low-occurrence common elements". +-- ++ +For instance, if you configured the `diff.algorithm` variable to a +non-default value and want to use the default one, then you +have to use `--diff-algorithm=default` option. |