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

diff --cc Documentation/githooks.txt
Simple merge

diff --cc builtin-commit.c
Simple merge

diff --cc builtin-fsck.c
Simple merge