summaryrefslogtreecommitdiff
path: root/diff.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-08-21 23:28:31 -0700
committerJunio C Hamano <gitster@pobox.com>2010-08-21 23:28:31 -0700
commite40b34b1ec2c91aaed5572116cd8d01afff7851f (patch)
treefe592011faace9f63915472f2ab791ca0428d74a /diff.h
parent613e4e5f4046ee36f40199cbaeb9f35442d24378 (diff)
parent5adba90d941cdce2aa32ff5b6f562daebef8c2e4 (diff)
downloadgit-e40b34b1ec2c91aaed5572116cd8d01afff7851f.tar.gz
Merge branch 'mm/shortopt-detached'
* mm/shortopt-detached: log: parse separate option for --glob log: parse separate options like git log --grep foo diff: parse separate options --stat-width n, --stat-name-width n diff: split off a function for --stat-* option parsing diff: parse separate options like -S foo Conflicts: revision.c
Diffstat (limited to 'diff.h')
-rw-r--r--diff.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/diff.h b/diff.h
index d43da9da95..bf2f44d840 100644
--- a/diff.h
+++ b/diff.h
@@ -218,6 +218,13 @@ extern void diff_unmerge(struct diff_options *,
#define DIFF_SETUP_USE_CACHE 2
#define DIFF_SETUP_USE_SIZE_CACHE 4
+/*
+ * Poor man's alternative to parse-option, to allow both sticked form
+ * (--option=value) and separate form (--option value).
+ */
+extern int parse_long_opt(const char *opt, const char **argv,
+ const char **optarg);
+
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 int diff_use_color_default;