diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-11-15 03:05:04 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-11-15 03:05:04 (GMT) |
| commit | da2b4ee3888d3df7dad6df5d0e5d2d8d3fa09746 (patch) | |
| tree | dc9f1a979f9f960ab2962104fe69340bebc12a85 /Documentation/diff-options.txt | |
| parent | 74ef46558ea98f4e24d1016c9961eb3d0d372be2 (diff) | |
| parent | bab76141da04ab094ece449e2127ef43a8fa60c8 (diff) | |
| download | git-da2b4ee3888d3df7dad6df5d0e5d2d8d3fa09746.zip git-da2b4ee3888d3df7dad6df5d0e5d2d8d3fa09746.tar.gz git-da2b4ee3888d3df7dad6df5d0e5d2d8d3fa09746.tar.bz2 | |
Merge branch 'cn/diff-indent-no-longer-is-experimental' into maint
Doc update.
* cn/diff-indent-no-longer-is-experimental:
diff: --indent-heuristic is no longer experimental
Diffstat (limited to 'Documentation/diff-options.txt')
| -rw-r--r-- | Documentation/diff-options.txt | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index a88c767..dd0dba5 100644 --- a/Documentation/diff-options.txt +++ b/Documentation/diff-options.txt @@ -63,7 +63,12 @@ ifndef::git-format-patch[] Synonym for `-p --raw`. endif::git-format-patch[] -include::diff-heuristic-options.txt[] +--indent-heuristic:: + Enable the heuristic that shift diff hunk boundaries to make patches + easier to read. This is the default. + +--no-indent-heuristic:: + Disable the indent heuristic. --minimal:: Spend extra time to make sure the smallest possible |