summaryrefslogtreecommitdiff
path: root/diff.h
diff options
context:
space:
mode:
authorRené Scharfe <rene.scharfe@lsrfire.ath.cx>2008-12-28 19:45:32 +0100
committerJunio C Hamano <gitster@pobox.com>2008-12-29 01:05:21 -0800
commit6d0e674a575421347abe5749e645ca6dc78c8207 (patch)
tree520bca6d03fe6bf525d218ea4d28805285f1e070 /diff.h
parent159c88e5ae95c5b02298193c1658fac5919c8012 (diff)
downloadgit-6d0e674a575421347abe5749e645ca6dc78c8207.tar.gz
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>
Diffstat (limited to 'diff.h')
-rw-r--r--diff.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/diff.h b/diff.h
index 42582edee6..4d5a32781d 100644
--- a/diff.h
+++ b/diff.h
@@ -78,6 +78,7 @@ struct diff_options {
const char *a_prefix, *b_prefix;
unsigned flags;
int context;
+ int interhunkcontext;
int break_opt;
int detect_rename;
int skip_stat_unmatch;