diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-09-26 16:44:27 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-09-26 16:44:27 -0700 |
| commit | ad70bf0a8bcaab0a6f1c36a42110b52dc2b00beb (patch) | |
| tree | 95495194621897b14bcc1d50852cc2fa8bbbf2f6 /git-diff.html | |
| parent | 5380048278a5f5aa14549fffee029a8273a8bd0d (diff) | |
| download | git-htmldocs-ad70bf0a8bcaab0a6f1c36a42110b52dc2b00beb.tar.gz | |
Autogenerated HTML docs for v2.10.0-440-g21f86
Diffstat (limited to 'git-diff.html')
| -rw-r--r-- | git-diff.html | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/git-diff.html b/git-diff.html index 721315775..91bf08147 100644 --- a/git-diff.html +++ b/git-diff.html @@ -931,6 +931,12 @@ and the range notations ("<commit>..<commit>" and </p>
</dd>
<dt class="hdlist1">
+--indent-heuristic
+</dt>
+<dt class="hdlist1">
+--no-indent-heuristic
+</dt>
+<dt class="hdlist1">
--compaction-heuristic
</dt>
<dt class="hdlist1">
@@ -938,10 +944,9 @@ and the range notations ("<commit>..<commit>" and </dt>
<dd>
<p>
- 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.
</p>
</dd>
<dt class="hdlist1">
|