summaryrefslogtreecommitdiffstats
path: root/git-show.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-09-26 16:44:27 -0700
committerJunio C Hamano <gitster@pobox.com>2016-09-26 16:44:27 -0700
commitad70bf0a8bcaab0a6f1c36a42110b52dc2b00beb (patch)
tree95495194621897b14bcc1d50852cc2fa8bbbf2f6 /git-show.html
parent5380048278a5f5aa14549fffee029a8273a8bd0d (diff)
downloadgit-htmldocs-ad70bf0a8bcaab0a6f1c36a42110b52dc2b00beb.tar.gz
Autogenerated HTML docs for v2.10.0-440-g21f86
Diffstat (limited to 'git-show.html')
-rw-r--r--git-show.html13
1 files changed, 9 insertions, 4 deletions
diff --git a/git-show.html b/git-show.html
index b42c94b4c..09e233629 100644
--- a/git-show.html
+++ b/git-show.html
@@ -1533,6 +1533,12 @@ $ git log -2 --pretty=%h 4da45bef</code></pre>
</p>
</dd>
<dt class="hdlist1">
+--indent-heuristic
+</dt>
+<dt class="hdlist1">
+--no-indent-heuristic
+</dt>
+<dt class="hdlist1">
--compaction-heuristic
</dt>
<dt class="hdlist1">
@@ -1540,10 +1546,9 @@ $ git log -2 --pretty=%h 4da45bef</code></pre>
</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">