Merge branch 'maint-1.7.0' into maint

* maint-1.7.0:
  Documentation/config: describe status.submodulesummary

diff --combined Documentation/config.txt
index c3ebd4d07c4b2839a34c48cda0d4e1612ea37f8b,8adb55c801852b89c93d53bba282772b595ca875..bcf37057590b9e4ec7b897d5c5107c09e5a69134
--- 1/Documentation/config.txt
--- 2/Documentation/config.txt
+++ b/Documentation/config.txt
@@@ -519,12 -519,10 +519,12 @@@ check that makes sure that existing obj
  core.notesRef::
        When showing commit messages, also show notes which are stored in
        the given ref.  This ref is expected to contain files named
 -      after the full SHA-1 of the commit they annotate.
 +      after the full SHA-1 of the commit they annotate.  The ref
 +      must be fully qualified.
  +
  If such a file exists in the given ref, the referenced blob is read, and
 -appended to the commit message, separated by a "Notes:" line.  If the
 +appended to the commit message, separated by a "Notes (<refname>):"
 +line (shortened to "Notes:" in the case of "refs/notes/commits").  If the
  given ref itself does not exist, it is not an error, but means that no
  notes should be printed.
  +
@@@ -557,13 -555,6 +557,13 @@@ it will be treated as a shell command
  executed from the top-level directory of a repository, which may
  not necessarily be the current directory.
  
 +am.keepcr::
 +      If true, git-am will call git-mailsplit for patches in mbox format
 +      with parameter '--keep-cr'. In this case git-mailsplit will
 +      not remove `\r` from lines ending with `\r\n`. Can be overrriden
 +      by giving '--no-keep-cr' from the command line.
 +      See linkgit:git-am[1], linkgit:git-mailsplit[1].
 +
  apply.ignorewhitespace::
        When set to 'change', tells 'git apply' to ignore changes in
        whitespace, in the same way as the '--ignore-space-change'
@@@ -692,29 -683,9 +692,29 @@@ color.grep:
        `never`), never.  When set to `true` or `auto`, use color only
        when the output is written to the terminal.  Defaults to `false`.
  
 -color.grep.match::
 -      Use customized color for matches.  The value of this variable
 -      may be specified as in color.branch.<slot>.
 +color.grep.<slot>::
 +      Use customized color for grep colorization.  `<slot>` specifies which
 +      part of the line to use the specified color, and is one of
 ++
 +--
 +`context`;;
 +      non-matching text in context lines (when using `-A`, `-B`, or `-C`)
 +`filename`;;
 +      filename prefix (when not using `-h`)
 +`function`;;
 +      function name lines (when using `-p`)
 +`linenumber`;;
 +      line number prefix (when using `-n`)
 +`match`;;
 +      matching text
 +`selected`;;
 +      non-matching text in selected lines
 +`separator`;;
 +      separators between fields on a line (`:`, `-`, and `=`)
 +      and between hunks (`--`)
 +--
 ++
 +The values of these variables may be specified as in color.branch.<slot>.
  
  color.interactive::
        When set to `always`, always use colors for interactive prompts
@@@ -1232,10 -1203,6 +1232,10 @@@ imap:
        The configuration variables in the 'imap' section are described
        in linkgit:git-imap-send[1].
  
 +init.templatedir::
 +      Specify the directory from which templates will be copied.
 +      (See the "TEMPLATE DIRECTORY" section of linkgit:git-init[1].)
 +
  instaweb.browser::
        Specify the program that will be used to browse your working
        repository in gitweb. See linkgit:git-instaweb[1].
@@@ -1336,53 -1303,6 +1336,53 @@@ mergetool.keepTemporaries:
  mergetool.prompt::
        Prompt before each invocation of the merge resolution program.
  
 +notes.displayRef::
 +      The (fully qualified) refname from which to show notes when
 +      showing commit messages.  The value of this variable can be set
 +      to a glob, in which case notes from all matching refs will be
 +      shown.  You may also specify this configuration variable
 +      several times.  A warning will be issued for refs that do not
 +      exist, but a glob that does not match any refs is silently
 +      ignored.
 ++
 +This setting can be overridden with the `GIT_NOTES_DISPLAY_REF`
 +environment variable, which must be a colon separated list of refs or
 +globs.
 ++
 +The effective value of "core.notesRef" (possibly overridden by
 +GIT_NOTES_REF) is also implicitly added to the list of refs to be
 +displayed.
 +
 +notes.rewrite.<command>::
 +      When rewriting commits with <command> (currently `amend` or
 +      `rebase`) and this variable is set to `true`, git
 +      automatically copies your notes from the original to the
 +      rewritten commit.  Defaults to `true`, but see
 +      "notes.rewriteRef" below.
 +
 +notes.rewriteMode::
 +      When copying notes during a rewrite (see the
 +      "notes.rewrite.<command>" option), determines what to do if
 +      the target commit already has a note.  Must be one of
 +      `overwrite`, `concatenate`, or `ignore`.  Defaults to
 +      `concatenate`.
 ++
 +This setting can be overridden with the `GIT_NOTES_REWRITE_MODE`
 +environment variable.
 +
 +notes.rewriteRef::
 +      When copying notes during a rewrite, specifies the (fully
 +      qualified) ref whose notes should be copied.  The ref may be a
 +      glob, in which case notes in all matching refs will be copied.
 +      You may also specify this configuration several times.
 ++
 +Does not have a default value; you must configure this variable to
 +enable note rewriting.
 ++
 +This setting can be overridden with the `GIT_NOTES_REWRITE_REF`
 +environment variable, which must be a colon separated list of refs or
 +globs.
 +
  pack.window::
        The size of the window used by linkgit:git-pack-objects[1] when no
        window size is given on the command line. Defaults to 10.
@@@ -1516,7 -1436,7 +1516,7 @@@ receive.denyDeletes:
        the ref. Use this to prevent such a ref deletion via a push.
  
  receive.denyCurrentBranch::
 -      If set to true or "refuse", receive-pack will deny a ref update
 +      If set to true or "refuse", git-receive-pack will deny a ref update
        to the currently checked out branch of a non-bare repository.
        Such a push is potentially dangerous because it brings the HEAD
        out of sync with the index and working tree. If set to "warn",
@@@ -1681,6 -1601,13 +1681,13 @@@ If this variable is not specified, it d
  This variable can be overridden with the -u|--untracked-files option
  of linkgit:git-status[1] and linkgit:git-commit[1].
  
+ status.submodulesummary::
+       Defaults to false.
+       If this is set to a non zero number or true (identical to -1 or an
+       unlimited number), the submodule summary will be enabled and a
+       summary of commits for modified submodules will be shown (see
+       --summary-limit option of linkgit:git-submodule[1]).
+ 
  tar.umask::
        This variable can be used to restrict the permission bits of
        tar archive entries.  The default is 0002, which turns off the