Merge branch 'maint'
commit9aae177a4adff326421e55c7c0f3138de15ce2c1
authorJunio C Hamano <junkio@cox.net>
Fri, 4 May 2007 06:26:54 +0000 (3 23:26 -0700)
committerJunio C Hamano <junkio@cox.net>
Fri, 4 May 2007 06:26:54 +0000 (3 23:26 -0700)
treeca19b08ff373ea122f87c90d03d111b03a89921e
parent50acc58914bf02217e55fdd739a844f2bfc45410
parente3ad95a8be82663d27cb501eaf9bad86a30f9cda
Merge branch 'maint'

* maint:
  gitweb: use decode_utf8 directly
  posix compatibility for t4200
  Document 'opendiff' value in config.txt and git-mergetool.txt
  Allow PERL_PATH="/usr/bin/env perl"
  Make xstrndup common
  diff.c: fix "size cache" handling.
  http-fetch: Disable use of curl multi support for libcurl < 7.16.
Documentation/config.txt
commit.c
diff.c
git-compat-util.h
gitweb/gitweb.perl