From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 18 Jan 2009 06:39:49 +0000 (-0800)
Subject: Merge branch 'maint-1.6.0' into maint
X-Git-Tag: v1.6.1.1~14
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=78f111e12de40e2d9aa8d0774acc287f79862b13;p=git.git

Merge branch 'maint-1.6.0' into maint

* maint-1.6.0:
  builtin-fsck: fix off by one head count
  Documentation: let asciidoc align related options
  githooks.txt: add missing word
  builtin-commit.c: do not remove COMMIT_EDITMSG
---

78f111e12de40e2d9aa8d0774acc287f79862b13