projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 3a3e3ac 979f792)
Merge branch 'nd/extended-sha1-relpath' into next
authorJunio C Hamano <gitster@pobox.com>
Wed, 8 Dec 2010 20:25:24 +0000 (12:25 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 8 Dec 2010 20:25:24 +0000 (12:25 -0800)
commit940e5e226b895a04bd0bd93471dd873677394a83
treea93ffa97fa001a2e93dc4a4aca7af932d949d7bctree | snapshot
parent3a3e3ac94135aa778d666f71a28b8ff341d28fbccommit | diff
parent979f792951913d75f992f87022b75610303a614fcommit | 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
cache.h diff1 | diff2 | blob | history
setup.c diff1 | diff2 | blob | history
sha1_name.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.