Merge branch 'maint-1.5.1' into maint

* maint-1.5.1:
annotate: make it work from subdirectories.
git-config: Correct asciidoc documentation for --int/--bool
t1300: Add tests for git-config --bool --get
unpack-trees.c: verify_uptodate: remove dead code
Use PATH_MAX instead of TEMPFILE_PATH_LEN
branch: fix segfault when resolving an invalid HEAD

diff --cc diff.c
Simple merge

diff --cc git.c
Simple merge

diff --cc unpack-trees.c
Simple merge