diff options
| author | Jonathan Nieder <jrnieder@gmail.com> | 2009-11-09 09:04:44 -0600 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-11-09 17:08:44 -0800 |
| commit | 6e9daeffec0213fa1cee76ad9d899fe492409f46 (patch) | |
| tree | 68445ac56175df2ba17359e455f2f671d66b6129 /builtin-merge-ours.c | |
| parent | fef34270f209eb5d2cde01b8175b24d96d1cff21 (diff) | |
| download | git-6e9daeffec0213fa1cee76ad9d899fe492409f46.tar.gz git-6e9daeffec0213fa1cee76ad9d899fe492409f46.tar.xz | |
Show usage string for 'git commit-tree -h'
Treat an "-h" option as a request for help, rather than a "Not a
valid object name" error.
"commit-tree -h" could be asking to create a new commit from a
treeish named "-h". Strictly speaking, such a pathological ref
name is possible, but the user would have to had said something
like "tags/-h" to name such a pathological already. commit-tree
is usually used in scripts with raw object ids, anyway.
For consistency, the "-h" option uses its new meaning even if
followed by other arguments.
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-merge-ours.c')
0 files changed, 0 insertions, 0 deletions