summaryrefslogtreecommitdiff
path: root/parse-options.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-06-21 13:02:45 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-06-21 13:02:45 (GMT)
commit632d3f4b5b80700c6c7c3637d6a4d1d9a457f7e1 (patch)
treebdf796bb5b9c6bbafaaaa9b9ba8b3b50e9c83bc7 /parse-options.h
parent762655010d6f051f632a77b8c5b95b9f5cad02c9 (diff)
parent47e9cd28f8a404a0d6293935252ddca5fc243931 (diff)
downloadgit-632d3f4b5b80700c6c7c3637d6a4d1d9a457f7e1.zip
git-632d3f4b5b80700c6c7c3637d6a4d1d9a457f7e1.tar.gz
git-632d3f4b5b80700c6c7c3637d6a4d1d9a457f7e1.tar.bz2
Merge branch 'gs/usage-to-stdout'
* gs/usage-to-stdout: parseopt: wrap rev-parse --parseopt usage for eval consumption print the usage string on stdout instead of stderr Conflicts: parse-options.h
Diffstat (limited to 'parse-options.h')
-rw-r--r--parse-options.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/parse-options.h b/parse-options.h
index 678b58d..7435cdb 100644
--- a/parse-options.h
+++ b/parse-options.h
@@ -36,7 +36,8 @@ enum parse_opt_option_flags {
PARSE_OPT_LASTARG_DEFAULT = 16,
PARSE_OPT_NODASH = 32,
PARSE_OPT_LITERAL_ARGHELP = 64,
- PARSE_OPT_NEGHELP = 128
+ PARSE_OPT_NEGHELP = 128,
+ PARSE_OPT_SHELL_EVAL = 256
};
struct option;