From 2477ab2ea8651920a9909f6d05b15ad9004a6c64 Mon Sep 17 00:00:00 2001 From: Jonathan Tan Date: Mon, 27 Nov 2017 11:47:47 -0800 Subject: diff: support anchoring line(s) Teach diff a new algorithm, one that attempts to prevent user-specified lines from appearing as a deletion or addition in the end result. The end user can use this by specifying "--anchored=" one or more times when using Git commands like "diff" and "show". Signed-off-by: Jonathan Tan Signed-off-by: Junio C Hamano --- diff.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'diff.h') diff --git a/diff.h b/diff.h index 0fb18dd73..7cf276f07 100644 --- a/diff.h +++ b/diff.h @@ -166,6 +166,10 @@ struct diff_options { const char *stat_sep; long xdl_opts; + /* see Documentation/diff-options.txt */ + char **anchors; + size_t anchors_nr, anchors_alloc; + int stat_width; int stat_name_width; int stat_graph_width; -- cgit v1.2.1