Merge branch 'nd/extended-sha1-relpath' into next
commit940e5e226b895a04bd0bd93471dd873677394a83
authorJunio C Hamano <gitster@pobox.com>
Wed, 8 Dec 2010 20:25:24 +0000 (8 12:25 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 8 Dec 2010 20:25:24 +0000 (8 12:25 -0800)
treea93ffa97fa001a2e93dc4a4aca7af932d949d7bc
parent3a3e3ac94135aa778d666f71a28b8ff341d28fbc
parent979f792951913d75f992f87022b75610303a614f
Merge branch 'nd/extended-sha1-relpath' into next

* nd/extended-sha1-relpath:
  get_sha1: support relative path ":path" syntax
  Make prefix_path() return char* without const

Conflicts:
sha1_name.c
cache.h
setup.c
sha1_name.c