Code

Merge branch 'cb/do-not-pretend-to-hijack-long-help'
authorJunio C Hamano <gitster@pobox.com>
Wed, 12 Oct 2011 19:34:30 +0000 (12:34 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 12 Oct 2011 19:34:30 +0000 (12:34 -0700)
* cb/do-not-pretend-to-hijack-long-help:
  use -h for synopsis and --help for manpage consistently


Trivial merge