diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-12-21 10:50:20 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-12-21 10:50:20 -0800 |
| commit | f1f509cc4504ebe9e2922c7bc61794183e3d441a (patch) | |
| tree | 747009988da437c4e9e20052f808a48be8934beb /builtin | |
| parent | builtin/init-db.c: eliminate -Wformat warning on Solaris (diff) | |
| parent | builtin/commit: add missing '/' in help message (diff) | |
| download | tgif-f1f509cc4504ebe9e2922c7bc61794183e3d441a.tar.xz | |
Merge branch 'ms/commit-cc-option-helpstring' into maint
* ms/commit-cc-option-helpstring:
builtin/commit: add missing '/' in help message
Diffstat (limited to 'builtin')
| -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 8f2bebecf3..b02e2c4e89 100644 --- a/builtin/commit.c +++ b/builtin/commit.c @@ -138,7 +138,7 @@ static struct option builtin_commit_options[] = { OPT_STRING('C', "reuse-message", &use_message, "commit", "reuse message from specified commit"), OPT_STRING(0, "fixup", &fixup_message, "commit", "use autosquash formatted message to fixup specified commit"), OPT_STRING(0, "squash", &squash_message, "commit", "use autosquash formatted message to squash specified commit"), - OPT_BOOLEAN(0, "reset-author", &renew_authorship, "the commit is authored by me now (used with -C-c/--amend)"), + OPT_BOOLEAN(0, "reset-author", &renew_authorship, "the commit is authored by me now (used with -C/-c/--amend)"), OPT_BOOLEAN('s', "signoff", &signoff, "add Signed-off-by:"), OPT_FILENAME('t', "template", &template_file, "use specified template file"), OPT_BOOLEAN('e', "edit", &edit_flag, "force edit of commit"), |