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)
commit5366afaedecf78ba72b819b0dbb60bda3fce2ca0
tree3dddbad750b53fc0ac5546d00cb8009d3351897a
parent7ed72d1813e570f21259f3576fde0cc62b6de888
parent87182b17ed471a7b9cbbc24e1c02f90c8725dc6f
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