diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-01-07 00:10:14 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-01-07 00:10:14 -0800 |
| commit | 7bb5321be0ecb70a990ad49da2a1366c19201372 (patch) | |
| tree | 82a8429e88beddb3b8bf8fb84aa39800670ae31d /Documentation | |
| parent | Merge branch 'js/maint-merge-recursive-r-d-conflict' (diff) | |
| parent | diff: add option to show context between close hunks (diff) | |
| download | tgif-7bb5321be0ecb70a990ad49da2a1366c19201372.tar.xz | |
Merge branch 'rs/diff-ihc'
* rs/diff-ihc:
diff: add option to show context between close hunks
Conflicts:
Documentation/diff-options.txt
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/diff-options.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index b432d2518a..671f533ca3 100644 --- a/Documentation/diff-options.txt +++ b/Documentation/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 |