From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 14 Aug 2008 02:22:29 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.6.0~18
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=a0653d550524a0263d36fde6a8cf98941dd057ab;p=git.git

Merge branch 'maint'

* maint:
  t5304-prune: adjust file mtime based on system time rather than file mtime
  Fix escaping of glob special characters in pathspecs
---

a0653d550524a0263d36fde6a8cf98941dd057ab