Merge branch 'pb/commit-verbose-config'

"git commit" learned to pay attention to "commit.verbose"
configuration variable and act as if "--verbose" option was
given from the command line.

* pb/commit-verbose-config:
  commit: add a commit.verbose config variable
  t7507-commit-verbose: improve test coverage by testing number of diffs
  parse-options.c: make OPTION_COUNTUP respect "unspecified" values
  t/t7507: improve test coverage
  t0040-parse-options: improve test coverage
  test-parse-options: print quiet as integer
  t0040-test-parse-options.sh: fix style issues

diff --cc Documentation/config.txt
index ea928a729fc780e58a6621f5982684751e2a2087,8bf60409f7dbd688f8836c460ce7ef624f071ec0..53f00dbc267db194c7c5558a008fd9d8ec20068c
--- 1/Documentation/config.txt
--- 2/Documentation/config.txt
+++ b/Documentation/config.txt
@@@ -1138,9 -1106,14 +1138,13 @@@ commit.status:
        message.  Defaults to true.
  
  commit.template::
 -      Specify a file to use as the template for new commit messages.
 -      "`~/`" is expanded to the value of `$HOME` and "`~user/`" to the
 -      specified user's home directory.
 +      Specify the pathname of a file to use as the template for
 +      new commit messages.
  
+ commit.verbose::
+       A boolean or int to specify the level of verbose with `git commit`.
+       See linkgit:git-commit[1].
+ 
  credential.helper::
        Specify an external helper to be called when a username or
        password credential is needed; the helper may consult external

diff --cc builtin/commit.c
Simple merge

diff --cc t/helper/test-parse-options.c
Simple merge