aboutsummaryrefslogtreecommitdiffstats
path: root/diff.h
diff options
context:
space:
mode:
authorDuy Nguyen <pclouds@gmail.com>2016-01-21 18:48:44 +0700
committerJunio C Hamano <gitster@pobox.com>2016-01-21 10:45:13 -0800
commita97262c62f1a31fcc7edf7629d313058bc7d66b5 (patch)
tree96f459828c6adbb05998b7fca180fef22bf41a7f /diff.h
parente5f7a5d16f2c890e7dda96e5681ee8f6687b45e4 (diff)
downloadgit-a97262c62f1a31fcc7edf7629d313058bc7d66b5.tar.gz
diff: make -O and --output work in subdirectory
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'diff.h')
-rw-r--r--diff.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/diff.h b/diff.h
index f61ee5494b..76b5536edb 100644
--- a/diff.h
+++ b/diff.h
@@ -268,7 +268,7 @@ extern int parse_long_opt(const char *opt, const char **argv,
extern int git_diff_basic_config(const char *var, const char *value, void *cb);
extern int git_diff_ui_config(const char *var, const char *value, void *cb);
extern void diff_setup(struct diff_options *);
-extern int diff_opt_parse(struct diff_options *, const char **, int);
+extern int diff_opt_parse(struct diff_options *, const char **, int, const char *);
extern void diff_setup_done(struct diff_options *);
#define DIFF_DETECT_RENAME 1