aboutsummaryrefslogtreecommitdiff
path: root/diff.h
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2007-03-03 22:51:46 -0800
committerJunio C Hamano <junkio@cox.net>2007-03-03 22:51:46 -0800
commite551208dea5cd40721c437faafb6d604dedffef5 (patch)
treeb38f46b7de8e076c58a574c7d570a7ef74e520f2 /diff.h
parent253e772edeb56092e0fad43ec0640658671313c5 (diff)
parentfcfa33ec905fcde1c16e7cbbe00d7147b89f1f01 (diff)
downloadgit-e551208dea5cd40721c437faafb6d604dedffef5.tar.gz
git-e551208dea5cd40721c437faafb6d604dedffef5.tar.xz
Merge branch 'js/diff-ni' (early part)
* 'js/diff-ni' (early part): diff: make more cases implicit --no-index
Diffstat (limited to 'diff.h')
-rw-r--r--diff.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/diff.h b/diff.h
index 4043cec04..4b435e8b1 100644
--- a/diff.h
+++ b/diff.h
@@ -222,6 +222,8 @@ extern void diff_flush(struct diff_options*);
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 setup_diff_no_index(struct rev_info *revs,
+ int argc, const char ** argv, int nongit, const char *prefix);
extern int run_diff_files_cmd(struct rev_info *revs, int argc, const char **argv);
extern int run_diff_index(struct rev_info *revs, int cached);