From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 6 May 2009 05:52:17 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.6.3~9
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=8146f19762c8fd67f6df3da4ba87a4e5ea880909;p=git.git

Merge branch 'maint'

* maint:
  improve error message in config.c
  t4018-diff-funcname: add cpp xfuncname pattern to syntax test
  Work around BSD whose typeof(tv.tv_sec) != time_t
  git-am.txt: reword extra headers in message body
  git-am.txt: Use date or value instead of time or timestamp
  git-am.txt: add an 'a', say what 'it' is, simplify a sentence
  dir.c: Fix two minor grammatical errors in comments
  git-svn: fix a sloppy Getopt::Long usage
---

8146f19762c8fd67f6df3da4ba87a4e5ea880909