Merge branch 'pb/config' into next
commit42d504248830452275dbe1c864f0b1771d7b1a05
authorJunio C Hamano <junkio@cox.net>
Mon, 19 Jun 2006 04:48:32 +0000 (18 21:48 -0700)
committerJunio C Hamano <junkio@cox.net>
Mon, 19 Jun 2006 04:48:32 +0000 (18 21:48 -0700)
tree011c7f094bfcdd41f510461c720485c8fbf1791e
parent94b9e07d05325e49936a0bc90ed5b177c3e9f215
parent7f29f7a95c906250c9c99d08242c2c4084c48d24
Merge branch 'pb/config' into next

* pb/config:
  Support for extracting configuration from different files
  Fix PPC SHA1 routine for large input buffers
  Make t8001-annotate and t8002-blame more portable
  Remove "refs" field from "struct object"
  Make release tarballs friendlier to older tar versions