Merge branch 'maint'

diff --git a/builtin/commit.c b/builtin/commit.c
index 9cbc4eadd99c8bb02dd647032d17d2a76d8d2d34..4fd1a1692f867e54eddd406d505e584ee0451cf8 100644 (file)
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -114,8 +114,8 @@ static int opt_parse_m(const struct option *opt, const char *arg, int unset)
 }
 
 static struct option builtin_commit_options[] = {
-       OPT__QUIET(&quiet),
-       OPT__VERBOSE(&verbose, "be verbose"),
+       OPT__QUIET(&quiet, "suppress summary after successful commit"),
+       OPT__VERBOSE(&verbose, "show diff in commit message template"),
 
        OPT_GROUP("Commit message options"),
        OPT_FILENAME('F', "file", &logfile, "read log from file"),