Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
diff: teach diff to display submodule difference with an inline diff
[gitweb.git]
/
diff.h
diff --git
a/diff.h
b/diff.h
index 14be35d0176cc9e7ce121c08fe8430d1e452abfa..2d884f1d08cc1b900d8e7e17c18b68d51041c0a6 100644
(file)
--- 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 {