git/xdiff
René Scharfe 6d0e674a57 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>
2008-12-29 01:05:21 -08:00
..
xdiff.h diff: add option to show context between close hunks 2008-12-29 01:05:21 -08:00
xdiffi.c Allow alternate "low-level" emit function from xdl_diff 2008-10-25 12:09:31 -07:00
xdiffi.h War on whitespace 2007-06-07 00:04:01 -07:00
xemit.c diff: add option to show context between close hunks 2008-12-29 01:05:21 -08:00
xemit.h Allow alternate "low-level" emit function from xdl_diff 2008-10-25 12:09:31 -07:00
xinclude.h War on whitespace 2007-06-07 00:04:01 -07:00
xmacros.h War on whitespace 2007-06-07 00:04:01 -07:00
xmerge.c xmerge.c: "diff3 -m" style clips merge reduction level to EAGER or less 2008-08-30 19:41:43 -07:00
xprepare.c xdiff: give up scanning similar lines early 2008-11-08 09:28:30 -08:00
xprepare.h War on whitespace 2007-06-07 00:04:01 -07:00
xtypes.h War on whitespace 2007-06-07 00:04:01 -07:00
xutils.c Remove unreachable statements 2007-11-15 21:23:47 -08:00
xutils.h War on whitespace 2007-06-07 00:04:01 -07:00