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 /resolve-undo.h | |
parent | 7ed72d1813e570f21259f3576fde0cc62b6de888 (diff) | |
parent | 87182b17ed471a7b9cbbc24e1c02f90c8725dc6f (diff) | |
download | git-5366afaedecf78ba72b819b0dbb60bda3fce2ca0.tar.gz |
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 'resolve-undo.h')
0 files changed, 0 insertions, 0 deletions