Merge branch 'maint'
commit738a1154db190c75a7454da85d85be68ad7db065
authorJunio C Hamano <junkio@cox.net>
Mon, 21 May 2007 02:58:03 +0000 (20 19:58 -0700)
committerJunio C Hamano <junkio@cox.net>
Mon, 21 May 2007 02:58:03 +0000 (20 19:58 -0700)
tree4abf7c8e14e98a6c0301cb34ad5acd8b42dcfe14
parent45bde46bfb9cbc5565f9fc6caa819333578c53e1
parent7df6ddf51ea71d81874ecfa34f670f50a3d45103
Merge branch 'maint'

* maint:
  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
builtin-branch.c