summaryrefslogtreecommitdiffstats
path: root/git-diff.html
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2009-01-07 10:14:16 +0000
committerJunio C Hamano <junio@hera.kernel.org>2009-01-07 10:14:16 +0000
commit1d40ee8bc5d32ad002e5350dd0134225bf26d114 (patch)
tree6ccb422dcc7fc78bc03f93fbd6ccf6f5f3731d8a /git-diff.html
parent4fbdd440748fc26b29440ef85b9d60919a96fcb0 (diff)
downloadgit-htmldocs-1d40ee8bc5d32ad002e5350dd0134225bf26d114.tar.gz
Autogenerated HTML docs for v1.6.1-76-gc123b
Diffstat (limited to 'git-diff.html')
-rw-r--r--git-diff.html11
1 files changed, 10 insertions, 1 deletions
diff --git a/git-diff.html b/git-diff.html
index 9fbb05916..85b8ada7b 100644
--- a/git-diff.html
+++ b/git-diff.html
@@ -799,6 +799,15 @@ and the range notations ("&lt;commit&gt;..&lt;commit&gt;" and
</p>
</dd>
<dt>
+--inter-hunk-context=&lt;lines&gt;
+</dt>
+<dd>
+<p>
+ Show the context between diff hunks, up to the specified number
+ of lines, thereby fusing hunks that are close to each other.
+</p>
+</dd>
+<dt>
--exit-code
</dt>
<dd>
@@ -1572,7 +1581,7 @@ Output diff in reverse.
</div>
<div id="footer">
<div id="footer-text">
-Last updated 2008-12-29 10:33:52 UTC
+Last updated 2009-01-07 10:13:51 UTC
</div>
</div>
</body>