Merge branch 'maint-1.6.0' into maint
commit78f111e12de40e2d9aa8d0774acc287f79862b13
authorJunio C Hamano <gitster@pobox.com>
Sun, 18 Jan 2009 06:39:49 +0000 (17 22:39 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sun, 18 Jan 2009 06:39:49 +0000 (17 22:39 -0800)
tree1c7f08c0e2ee31b86a2bfa1c010f5d7bddc3d0fb
parent8ee09acd8f3c96683ce2b81bb8ac8079f0e8a4fd
parent3aed2fda6f8233895be0d1142c4c4b407fb692c3
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
Documentation/githooks.txt
builtin-commit.c
builtin-fsck.c