• René Scharfe's avatar
    diff: add option to show context between close hunks · 6d0e674a
    René Scharfe authored
    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: default avatarRene Scharfe <rene.scharfe@lsrfire.ath.cx>
    Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
    6d0e674a
t4032-diff-inter-hunk-context.sh 1.23 KB