From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 19 Oct 2010 21:16:28 +0000 (-0700)
Subject: Merge branch 'master' into next
X-Git-Tag: ko-next~190
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=329be7730532291c77109721f24f39d596b95511;p=git.git

Merge branch 'master' into next

* master:
  {cvs,svn}import: use the new 'git read-tree --empty'
  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
---

329be7730532291c77109721f24f39d596b95511