Merge branch 'cb/do-not-pretend-to-hijack-long-help' into next
commit46851fe10566b5ad43b4bfa8daeebcab0dab6b49
authorJunio C Hamano <gitster@pobox.com>
Thu, 6 Oct 2011 22:42:03 +0000 (6 15:42 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 6 Oct 2011 22:42:03 +0000 (6 15:42 -0700)
tree2bfa23c071e961cf97961adca7fa0810dbd421a0
parentde8f6f2f1f55b55e9c0ad7cba263eed92a49f361
parent87182b17ed471a7b9cbbc24e1c02f90c8725dc6f
Merge branch 'cb/do-not-pretend-to-hijack-long-help' into next

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