From: Shawn O. Pearce <spearce@spearce.org>
Date: Wed, 17 Oct 2007 03:32:03 +0000 (-0400)
Subject: Merge branch 'maint'
X-Git-Tag: v1.5.4-rc0~353
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=317efa63fc457d1a726902ddf97298c201df627c;p=git.git

Merge branch 'maint'

* maint:
  Document additional 1.5.3.5 fixes in release notes
  Avoid 'expr index' on Mac OS X as it isn't supported
  filter-branch: update current branch when rewritten
  fix filter-branch documentation
  helpful error message when send-pack finds no refs in common.
  Fix setup_git_directory_gently() with relative GIT_DIR & GIT_WORK_TREE
  Correct typos in release notes for 1.5.3.5
---

317efa63fc457d1a726902ddf97298c201df627c