diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-06-21 06:02:45 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-06-21 06:02:45 -0700 |
| commit | 632d3f4b5b80700c6c7c3637d6a4d1d9a457f7e1 (patch) | |
| tree | bdf796bb5b9c6bbafaaaa9b9ba8b3b50e9c83bc7 /parse-options.h | |
| parent | 762655010d6f051f632a77b8c5b95b9f5cad02c9 (diff) | |
| parent | 47e9cd28f8a404a0d6293935252ddca5fc243931 (diff) | |
| download | git-632d3f4b5b80700c6c7c3637d6a4d1d9a457f7e1.tar.gz | |
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.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/parse-options.h b/parse-options.h index 678b58db8e..7435cdbf1d 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; |