From: Junio C Hamano <redacted>
Date: Mon, 23 May 2016 21:54:31 +0000 (-0700)
Subject: Merge branch 'pb/commit-verbose-config'
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=5d5f1c236b63596a59293a893d914dab1c8dd377;p=git.git

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
---

5d5f1c236b63596a59293a893d914dab1c8dd377
diff --cc Documentation/config.txt
index ea928a729f,8bf60409f7..53f00dbc26
--- a/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