Merge branch 'gs/usage-to-stdout'
commit632d3f4b5b80700c6c7c3637d6a4d1d9a457f7e1
authorJunio C Hamano <gitster@pobox.com>
Mon, 21 Jun 2010 13:02:45 +0000 (21 06:02 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 21 Jun 2010 13:02:45 +0000 (21 06:02 -0700)
treebdf796bb5b9c6bbafaaaa9b9ba8b3b50e9c83bc7
parent762655010d6f051f632a77b8c5b95b9f5cad02c9
parent47e9cd28f8a404a0d6293935252ddca5fc243931
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
parse-options.h