diff options
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/diff-config.txt | 7 | ||||
| -rw-r--r-- | Documentation/diff-options.txt | 9 |
2 files changed, 9 insertions, 7 deletions
diff --git a/Documentation/diff-config.txt b/Documentation/diff-config.txt index f1101c7b21..ad368acda6 100644 --- a/Documentation/diff-config.txt +++ b/Documentation/diff-config.txt @@ -170,10 +170,11 @@ diff.tool:: include::mergetools-diff.txt[] +diff.indentHeuristic:: diff.compactionHeuristic:: - Set this option to `true` to enable an experimental heuristic that - shifts the hunk boundary in an attempt to make the resulting - patch easier to read. + Set one of these options to `true` to enable one of two + experimental heuristics that shift diff hunk boundaries to + make patches easier to read. diff.algorithm:: Choose a diff algorithm. The variants are as follows: diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index d9ae681d8f..3a07f6f475 100644 --- a/Documentation/diff-options.txt +++ b/Documentation/diff-options.txt @@ -63,12 +63,13 @@ ifndef::git-format-patch[] Synonym for `-p --raw`. endif::git-format-patch[] +--indent-heuristic:: +--no-indent-heuristic:: --compaction-heuristic:: --no-compaction-heuristic:: - These are to help debugging and tuning an experimental - heuristic (which is off by default) that shifts the hunk - boundary in an attempt to make the resulting patch easier - to read. + These are to help debugging and tuning experimental heuristics + (which are off by default) that shift diff hunk boundaries to + make patches easier to read. --minimal:: Spend extra time to make sure the smallest possible |