Merge branch 'master' into next

diff --git a/diff.h b/diff.h
index da4bd421fe4ab21fd48f1d423e77963a0598c5e4..7150b90385952373f4fd49eb073d819541cc306d 100644 (file)
--- a/diff.h
+++ b/diff.h
@@ -171,4 +171,6 @@ extern const char *diff_unique_abbrev(const unsigned char *, int);
 
 extern int run_diff_files(struct rev_info *revs, int silent_on_removed);
 
+extern int run_diff_index(struct rev_info *revs, int cached);
+
 #endif /* DIFF_H */