diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-10-12 12:34:30 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-10-12 12:34:30 -0700 |
| commit | 5366afaedecf78ba72b819b0dbb60bda3fce2ca0 (patch) | |
| tree | 3dddbad750b53fc0ac5546d00cb8009d3351897a /merge-file.h | |
| parent | Merge branch 'sp/smart-http-failure' (diff) | |
| parent | use -h for synopsis and --help for manpage consistently (diff) | |
| download | tgif-5366afaedecf78ba72b819b0dbb60bda3fce2ca0.tar.xz | |
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
Diffstat (limited to 'merge-file.h')
0 files changed, 0 insertions, 0 deletions