Merge branch 'jc/rev-parse-argh-dashed-multi-words'

diff --git a/builtin/commit.c b/builtin/commit.c
index d9550c54d02bbd1ba4df87734433dea4a7097e2e..215b5bec192777b36953c76fa8b15c5b14a8a643 100644 (file)
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -1501,7 +1501,7 @@ int cmd_commit(int argc, const char **argv, const char *prefix)
                OPT_BOOL('e', "edit", &edit_flag, N_("force edit of commit")),
                OPT_STRING(0, "cleanup", &cleanup_arg, N_("default"), N_("how to strip spaces and #comments from message")),
                OPT_BOOL(0, "status", &include_status, N_("include status in commit message template")),
-               { OPTION_STRING, 'S', "gpg-sign", &sign_commit, N_("key id"),
+               { OPTION_STRING, 'S', "gpg-sign", &sign_commit, N_("key-id"),
                  N_("GPG sign commit"), PARSE_OPT_OPTARG, NULL, (intptr_t) "" },
                /* end commit message options */