diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-04-27 21:47:51 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-04-27 21:47:51 -0700 |
| commit | 633d1fe9d0f8993c4e0ceb9d166a550344cbe5f9 (patch) | |
| tree | 85c9fc7d124b0977629dc4128162e28bed53a8cc /builtin-commit.c | |
| parent | 07ba53f724b95a817f957b8e943c9e4f545a0949 (diff) | |
| parent | a2b26acd7afb4d77d8844ccd681e993f25e75205 (diff) | |
| download | git-633d1fe9d0f8993c4e0ceb9d166a550344cbe5f9.tar.gz git-633d1fe9d0f8993c4e0ceb9d166a550344cbe5f9.tar.xz | |
Merge branch 'maint'
* maint:
clone: detect and fail on excess parameters
Remove 'header' from --signoff option description
Diffstat (limited to 'builtin-commit.c')
| -rw-r--r-- | builtin-commit.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-commit.c b/builtin-commit.c index b41d4a356..256181a68 100644 --- a/builtin-commit.c +++ b/builtin-commit.c @@ -90,7 +90,7 @@ static struct option builtin_commit_options[] = { OPT_CALLBACK('m', "message", &message, "MESSAGE", "specify commit message", opt_parse_m), OPT_STRING('c', "reedit-message", &edit_message, "COMMIT", "reuse and edit message from specified commit "), OPT_STRING('C', "reuse-message", &use_message, "COMMIT", "reuse message from specified commit"), - OPT_BOOLEAN('s', "signoff", &signoff, "add Signed-off-by: header"), + OPT_BOOLEAN('s', "signoff", &signoff, "add Signed-off-by:"), OPT_STRING('t', "template", &template_file, "FILE", "use specified template file"), OPT_BOOLEAN('e', "edit", &edit_flag, "force edit of commit"), |