From: Junio C Hamano <junkio@cox.net>
Date: Wed, 14 Feb 2007 23:25:53 +0000 (-0800)
Subject: Merge branch 'maint'
X-Git-Tag: v1.5.1-rc1~288
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=78e90f89e39b112af2670516f80586163dcd56ca;p=git.git

Merge branch 'maint'

* maint:
  GIT-VERSION-FILE: check ./version first.
  sha1_file.c: Round the mmap offset to half the window size.
  Make sure packedgitwindowsize is multiple of (pagesize * 2)
  Add RelNotes 1.5.0.1
  Still updating 1.5.0 release notes.
  git-daemon: Avoid leaking the listening sockets into child processes.
  Clarify two backward incompatible repository options.
---

78e90f89e39b112af2670516f80586163dcd56ca