From fd47ae6a5b9cc0cfc56c1f7c43db612d26ca4b75 Mon Sep 17 00:00:00 2001 From: Jacob Keller Date: Wed, 31 Aug 2016 16:27:25 -0700 Subject: diff: teach diff to display submodule difference with an inline diff Teach git-diff and friends a new format for displaying the difference of a submodule. The new format is an inline diff of the contents of the submodule between the commit range of the update. This allows the user to see the actual code change caused by a submodule update. Add tests for the new format and option. Signed-off-by: Jacob Keller Signed-off-by: Junio C Hamano --- diff.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'diff.h') diff --git a/diff.h b/diff.h index 14be35d01..2d884f1d0 100644 --- a/diff.h +++ b/diff.h @@ -111,7 +111,8 @@ enum diff_words_type { enum diff_submodule_format { DIFF_SUBMODULE_SHORT = 0, - DIFF_SUBMODULE_LOG + DIFF_SUBMODULE_LOG, + DIFF_SUBMODULE_INLINE_DIFF }; struct diff_options { -- cgit v1.2.1