From: Junio C Hamano <junkio@cox.net>
Date: Mon, 21 May 2007 02:57:00 +0000 (-0700)
Subject: Merge branch 'maint-1.5.1' into maint
X-Git-Tag: v1.5.2.1~23
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7df6ddf51ea71d81874ecfa34f670f50a3d45103;p=git.git

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
---

7df6ddf51ea71d81874ecfa34f670f50a3d45103