diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-03-23 15:58:12 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-03-24 10:43:34 -0700 |
| commit | e703d7118c68bb5b1f850dae4060609a88500b18 (patch) | |
| tree | 930af71c9cd0b2e0efc558bd760d6992e58414b2 /builtin/revert.c | |
| parent | ce7f8745aa773dfe2fc0a1b8c327b50c7ce4a31e (diff) | |
| download | git-e703d7118c68bb5b1f850dae4060609a88500b18.tar.gz git-e703d7118c68bb5b1f850dae4060609a88500b18.tar.xz | |
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/revert.c')
| -rw-r--r-- | builtin/revert.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/revert.c b/builtin/revert.c index 065d88dd0..f9ed5bd5d 100644 --- a/builtin/revert.c +++ b/builtin/revert.c @@ -89,7 +89,7 @@ static void parse_args(int argc, const char **argv, struct replay_opts *opts) OPT_STRING(0, "strategy", &opts->strategy, N_("strategy"), N_("merge strategy")), OPT_CALLBACK('X', "strategy-option", &opts, N_("option"), N_("option for merge strategy"), option_parse_x), - { OPTION_STRING, 'S', "gpg-sign", &opts->gpg_sign, N_("key id"), + { OPTION_STRING, 'S', "gpg-sign", &opts->gpg_sign, N_("key-id"), N_("GPG sign commit"), PARSE_OPT_OPTARG, NULL, (intptr_t) "" }, OPT_END(), OPT_END(), |