summaryrefslogtreecommitdiffstats
path: root/diff-options.txt
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 /diff-options.txt
parent4fbdd440748fc26b29440ef85b9d60919a96fcb0 (diff)
downloadgit-htmldocs-1d40ee8bc5d32ad002e5350dd0134225bf26d114.tar.gz
Autogenerated HTML docs for v1.6.1-76-gc123b
Diffstat (limited to 'diff-options.txt')
-rw-r--r--diff-options.txt4
1 files changed, 4 insertions, 0 deletions
diff --git a/diff-options.txt b/diff-options.txt
index b432d2518..671f533ca 100644
--- a/diff-options.txt
+++ b/diff-options.txt
@@ -205,6 +205,10 @@ endif::git-format-patch[]
differences even if one line has whitespace where the other
line has none.
+--inter-hunk-context=<lines>::
+ Show the context between diff hunks, up to the specified number
+ of lines, thereby fusing hunks that are close to each other.
+
--exit-code::
Make the program exit with codes similar to diff(1).
That is, it exits with 1 if there were differences and