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

diff --combined parse-options.h
index 678b58db8e49d9c9f8a11811e632dd9b81a9d9a8,e16b4d201a998390672cdade90bacde64d9ad29c..7435cdbf1d94378cf1c3408ae17cb610165a00ba
--- 1/parse-options.h
--- 2/parse-options.h
+++ b/parse-options.h
@@@ -25,7 -25,7 +25,7 @@@ enum parse_opt_flags 
        PARSE_OPT_STOP_AT_NON_OPTION = 2,
        PARSE_OPT_KEEP_ARGV0 = 4,
        PARSE_OPT_KEEP_UNKNOWN = 8,
 -      PARSE_OPT_NO_INTERNAL_HELP = 16,
 +      PARSE_OPT_NO_INTERNAL_HELP = 16
  };
  
  enum parse_opt_option_flags {
@@@ -36,7 -36,8 +36,8 @@@
        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;
@@@ -160,7 -161,7 +161,7 @@@ extern NORETURN void usage_msg_opt(cons
  enum {
        PARSE_OPT_HELP = -1,
        PARSE_OPT_DONE,
 -      PARSE_OPT_UNKNOWN,
 +      PARSE_OPT_UNKNOWN
  };
  
  /*