Merge branch 'maint'

* maint:
t/t9001-send-email.sh: fix stderr redirection in 'Invalid In-Reply-To'
Clarify and extend the "git diff" format documentation
git-show-ref.txt: clarify the pattern matching
documentation: git-config minor cleanups
Update test script annotate-tests.sh to handle missing/extra authors

diff --combined Documentation/config.txt
index 71ddb6c1712e7d042f227069eec8a3083480fe27,7f6b2109bd83a55b7dddd8a8bc36c6fc1006a134..ba9639c7bd5050a7f540e6d85257aa83bf6062ae
--- 1/Documentation/config.txt
--- 2/Documentation/config.txt
+++ b/Documentation/config.txt
@@@ -459,12 -459,6 +459,12 @@@ core.askpass:
        prompt. The external program shall be given a suitable prompt as
        command line argument and write the password on its STDOUT.
  
 +core.attributesfile::
 +      In addition to '.gitattributes' (per-directory) and
 +      '.git/info/attributes', git looks into this file for attributes
 +      (see linkgit:gitattributes[5]). Path expansions are made the same
 +      way as for `core.excludesfile`.
 +
  core.editor::
        Commands such as `commit` and `tag` that lets you edit
        messages by launching an editor uses the value of this
@@@ -1472,10 -1466,6 +1472,10 @@@ pack.compression:
        not set,  defaults to -1, the zlib default, which is "a default
        compromise between speed and compression (currently equivalent
        to level 6)."
 ++
 +Note that changing the compression level will not automatically recompress
 +all existing objects. You can force recompression by passing the -F option
 +to linkgit:git-repack[1].
  
  pack.deltaCacheSize::
        The maximum memory in bytes used for caching deltas in
@@@ -1560,12 -1550,12 +1560,12 @@@ push.default:
        no refspec is implied by any of the options given on the command
        line. Possible values are:
  +
- * `nothing` do not push anything.
- * `matching` push all matching branches.
+ * `nothing` - do not push anything.
+ * `matching` - push all matching branches.
    All branches having the same name in both ends are considered to be
    matching. This is the default.
- * `tracking` push the current branch to its upstream branch.
- * `current` push the current branch to a branch of the same name.
+ * `tracking` - push the current branch to its upstream branch.
+ * `current` - push the current branch to a branch of the same name.
  
  rebase.stat::
        Whether to show a diffstat of what changed upstream since the last
@@@ -1765,9 -1755,9 +1765,9 @@@ status.showUntrackedFiles:
        the untracked files. Possible values are:
  +
  --
-       - 'no'     - Show no untracked files
-       - 'normal' - Shows untracked files and directories
-       - 'all'    - Shows also individual files in untracked directories.
+ * `no` - Show no untracked files.
+ * `normal` - Show untracked files and directories.
+ * `all` - Show also individual files in untracked directories.
  --
  +
  If this variable is not specified, it defaults to 'normal'.

diff --combined t/t9001-send-email.sh
index 6f67da4e71459e8ae44cce2a23c6f62c34947d12,07c50c764c5ed465b78d2e61ac0b0f9bf58efb64..a298eb04373f622473e3d33c9a46c6734f8a8fc8
--- 1/t/t9001-send-email.sh
--- 2/t/t9001-send-email.sh
+++ b/t/t9001-send-email.sh
@@@ -279,7 -279,7 +279,7 @@@ test_expect_success $PREREQ 'Invalid In
                --to=nobody@example.com \
                --in-reply-to=" " \
                --smtp-server="$(pwd)/fake.sendmail" \
-               $patches
+               $patches \
                2>errors
        ! grep "^In-Reply-To: < *>" msgtxt1
  '
@@@ -1032,40 -1032,4 +1032,40 @@@ test_expect_success $PREREQ '--8bit-enc
        test_cmp expected actual
  '
  
 +# Note that the patches in this test are deliberately out of order; we
 +# want to make sure it works even if the cover-letter is not in the
 +# first mail.
 +test_expect_success 'refusing to send cover letter template' '
 +      clean_fake_sendmail &&
 +      rm -fr outdir &&
 +      git format-patch --cover-letter -2 -o outdir &&
 +      test_must_fail git send-email \
 +        --from="Example <nobody@example.com>" \
 +        --to=nobody@example.com \
 +        --smtp-server="$(pwd)/fake.sendmail" \
 +        outdir/0002-*.patch \
 +        outdir/0000-*.patch \
 +        outdir/0001-*.patch \
 +        2>errors >out &&
 +      grep "SUBJECT HERE" errors &&
 +      test -z "$(ls msgtxt*)"
 +'
 +
 +test_expect_success '--force sends cover letter template anyway' '
 +      clean_fake_sendmail &&
 +      rm -fr outdir &&
 +      git format-patch --cover-letter -2 -o outdir &&
 +      git send-email \
 +        --force \
 +        --from="Example <nobody@example.com>" \
 +        --to=nobody@example.com \
 +        --smtp-server="$(pwd)/fake.sendmail" \
 +        outdir/0002-*.patch \
 +        outdir/0000-*.patch \
 +        outdir/0001-*.patch \
 +        2>errors >out &&
 +      ! grep "SUBJECT HERE" errors &&
 +      test -n "$(ls msgtxt*)"
 +'
 +
  test_done