From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 19 Oct 2010 21:15:51 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.7.4-rc0~175
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c7deb8dac1f24498a353327ec9fceb99695582c2;p=git.git

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

c7deb8dac1f24498a353327ec9fceb99695582c2