From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 12 Oct 2011 19:34:30 +0000 (-0700)
Subject: Merge branch 'cb/do-not-pretend-to-hijack-long-help'
X-Git-Tag: v1.7.8-rc0~92
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5366afaedecf78ba72b819b0dbb60bda3fce2ca0;p=git.git

Merge branch 'cb/do-not-pretend-to-hijack-long-help'

* cb/do-not-pretend-to-hijack-long-help:
  use -h for synopsis and --help for manpage consistently
---

5366afaedecf78ba72b819b0dbb60bda3fce2ca0