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

Junio C Hamano committed Oct 12, 2011 at 12:34 UTC 5366afaedecf78ba72b819b0dbb60bda3fce2ca0

No changes.