author | Junio C Hamano <gitster@pobox.com> | |
Wed, 8 Dec 2010 20:25:24 +0000 (12:25 -0800) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Wed, 8 Dec 2010 20:25:24 +0000 (12:25 -0800) | ||
commit | 940e5e226b895a04bd0bd93471dd873677394a83 | |
tree | a93ffa97fa001a2e93dc4a4aca7af932d949d7bc | tree | snapshot |
parent | 3a3e3ac94135aa778d666f71a28b8ff341d28fbc | commit | diff |
parent | 979f792951913d75f992f87022b75610303a614f | commit | diff |
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
* nd/extended-sha1-relpath:
get_sha1: support relative path ":path" syntax
Make prefix_path() return char* without const
Conflicts:
sha1_name.c
cache.h | diff1 | | diff2 | | blob | history |
setup.c | diff1 | | diff2 | | blob | history |
sha1_name.c | diff1 | | diff2 | | blob | history |