diff options
author | Junio C Hamano <gitster@pobox.com> | 2014-03-23 23:58:12 +0100 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2014-03-24 18:43:34 +0100 |
commit | e703d7118c68bb5b1f850dae4060609a88500b18 (patch) | |
tree | 930af71c9cd0b2e0efc558bd760d6992e58414b2 /builtin/tag.c | |
parent | t1502: protect runs of SPs used in the indentation (diff) | |
download | git-e703d7118c68bb5b1f850dae4060609a88500b18.tar.xz git-e703d7118c68bb5b1f850dae4060609a88500b18.zip |
parse-options: multi-word argh should use dash to separate words
"When you need to use space, use dash" is a strange way to say that
you must not use a space. Because it is more common for the command
line descriptions to use dashed-multi-words, you do not even want to
use spaces in these places. Rephrase the documentation to avoid
this strangeness.
Fix a few existing multi-word argument help strings, i.e.
- GPG key-ids given to -S/--gpg-sign are "key-id";
- Refs used for storing notes are "notes-ref"; and
- Expiry timestamps given to --expire are "expiry-date".
and update the corresponding documentation pages.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/tag.c')
-rw-r--r-- | builtin/tag.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/tag.c b/builtin/tag.c index 40356e3e41..6c7c6bde9d 100644 --- a/builtin/tag.c +++ b/builtin/tag.c @@ -513,7 +513,7 @@ int cmd_tag(int argc, const char **argv, const char *prefix) OPT_BOOL('s', "sign", &opt.sign, N_("annotated and GPG-signed tag")), OPT_STRING(0, "cleanup", &cleanup_arg, N_("mode"), N_("how to strip spaces and #comments from message")), - OPT_STRING('u', "local-user", &keyid, N_("key id"), + OPT_STRING('u', "local-user", &keyid, N_("key-id"), N_("use another key to sign the tag")), OPT__FORCE(&force, N_("replace the tag if exists")), OPT_COLUMN(0, "column", &colopts, N_("show tag list in columns")), |