From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 21 Jun 2010 13:02:45 +0000 (-0700)
Subject: Merge branch 'gs/usage-to-stdout'
X-Git-Tag: v1.7.2-rc0~30
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/632d3f4b5b80700c6c7c3637d6a4d1d9a457f7e1?ds=inline;hp=-c

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
---

632d3f4b5b80700c6c7c3637d6a4d1d9a457f7e1
diff --combined parse-options.h
index 678b58db8e,e16b4d201a..7435cdbf1d
--- a/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
  };
  
  /*