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: http://git.tremily.us/?a=commitdiff_plain;h=632d3f4b5b80700c6c7c3637d6a4d1d9a457f7e1;p=git.git

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