From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 18 Jan 2009 07:04:40 +0000 (-0800)
Subject: Merge branch 'maint'
X-Git-Tag: v1.6.2-rc0~144
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=58f37f3c07ef4869f88c79b61f11829bebf7bf40;p=git.git

Merge branch 'maint'

* maint:
  Update draft release notes for 1.6.1.1
  builtin-fsck: fix off by one head count
  t5540: clarify that http-push does not handle packed-refs on the remote
  http-push: when making directories, have a trailing slash in the path name
  http-push: fix off-by-path_len
  Documentation: let asciidoc align related options
  githooks.txt: add missing word
  builtin-commit.c: do not remove COMMIT_EDITMSG
---

58f37f3c07ef4869f88c79b61f11829bebf7bf40