From: Shawn O. Pearce <spearce@spearce.org>
Date: Fri, 19 Oct 2007 05:18:55 +0000 (-0400)
Subject: Merge branch 'maint'
X-Git-Tag: v1.5.4-rc0~338
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f5bf6feb05b8c89c448ded6e6fad0eb58ef35463;p=git.git

Merge branch 'maint'

* maint:
  Further 1.5.3.5 fixes described in release notes
  Avoid invoking diff drivers during git-stash
  attr: fix segfault in gitattributes parsing code
  Define NI_MAXSERV if not defined by operating system
  Ensure we add directories in the correct order
  Avoid scary errors about tagged trees/blobs during git-fetch
---

f5bf6feb05b8c89c448ded6e6fad0eb58ef35463