Merge branch 'maint-1.5.1' into maint
commit7df6ddf51ea71d81874ecfa34f670f50a3d45103
authorJunio C Hamano <junkio@cox.net>
Mon, 21 May 2007 02:57:00 +0000 (20 19:57 -0700)
committerJunio C Hamano <junkio@cox.net>
Mon, 21 May 2007 02:57:00 +0000 (20 19:57 -0700)
tree479b8f75453017af3076f9e246facdb5f9b7917b
parentaba170cdb4874b72dd619e6f7bbc13c33295f831
parent5b6dedd6a0b7566f7e8466b6aefe8f019c52f5d3
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.c
git.c
unpack-trees.c