diff: add option to show context between close hunks
commit6d0e674a575421347abe5749e645ca6dc78c8207
authorRené Scharfe <rene.scharfe@lsrfire.ath.cx>
Sun, 28 Dec 2008 18:45:32 +0000 (28 19:45 +0100)
committerJunio C Hamano <gitster@pobox.com>
Mon, 29 Dec 2008 09:05:21 +0000 (29 01:05 -0800)
tree520bca6d03fe6bf525d218ea4d28805285f1e070
parent159c88e5ae95c5b02298193c1658fac5919c8012
diff: add option to show context between close hunks

Merge two hunks if there is only the specified number of otherwise unshown
context between them.  For --inter-hunk-context=1, the resulting patch has
the same number of lines but shows uninterrupted context instead of a
context header line in between.

Patches generated with this option are easier to read but are also more
likely to conflict if the file to be patched contains other changes.

This patch keeps the default for this option at 0.  It is intended to just
make the feature available in order to see its advantages and downsides.

Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/diff-options.txt
contrib/completion/git-completion.bash
diff.c
diff.h
t/t4032-diff-inter-hunk-context.sh [new file with mode: 0755]
xdiff/xdiff.h
xdiff/xemit.c