Code

Merge branch 'maint'
authorShawn O. Pearce <spearce@spearce.org>
Fri, 19 Oct 2007 05:18:55 +0000 (01:18 -0400)
committerShawn O. Pearce <spearce@spearce.org>
Fri, 19 Oct 2007 05:18:55 +0000 (01:18 -0400)
commitf5bf6feb05b8c89c448ded6e6fad0eb58ef35463
tree9f166b46e5005a38d0aeb59a9b4880b508578688
parentd7e56dbc4f60f6bd238e8612783541d89f006fb7
parentbbaf63f2f18242484868d6c03d5df9bd071d6deb
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
attr.c
builtin-fetch--tool.c
git-cvsexportcommit.perl