summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-12-21 10:50:20 -0800
committerJunio C Hamano <gitster@pobox.com>2011-12-21 10:50:20 -0800
commitf1f509cc4504ebe9e2922c7bc61794183e3d441a (patch)
tree747009988da437c4e9e20052f808a48be8934beb
parent97f261b1e7f1af54aed700e61cdb8af74dbd2459 (diff)
parentee0400df4eb13ea9b1ee3f03a50e479048f1780f (diff)
downloadgit-f1f509cc4504ebe9e2922c7bc61794183e3d441a.tar.gz
Merge branch 'ms/commit-cc-option-helpstring' into maint
* ms/commit-cc-option-helpstring: builtin/commit: add missing '/' in help message
-rw-r--r--builtin/commit.c2
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"),