git.tremily.us Git - git.git/commit

author	Junio C Hamano <gitster@pobox.com>
	Thu, 16 Dec 2010 20:51:05 +0000 (12:51 -0800)
committer	Junio C Hamano <gitster@pobox.com>
	Thu, 16 Dec 2010 20:51:05 +0000 (12:51 -0800)
commit	620b89cd98219db33ce499c7f8e50d091fe9b598
tree	0838749541fdf9f5fe36466bddc6d3d4167a0248	tree \| snapshot
parent	f68b780b2575628eca75e9502e4997f98ad2af3b	commit \| diff
parent	3d6e0f745e5b958387c9116ff5ba6247b990e6e7	commit \| diff

Merge branch 'nd/extended-sha1-relpath'

* nd/extended-sha1-relpath:
  get_sha1: teach ":$n:<path>" the same relative path logic
  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

Git—the stupid content tracker

RSS Atom

cache.h	diff1 \|	diff2 \|	blob \| history
setup.c	diff1 \|	diff2 \|	blob \| history
sha1_name.c	diff1 \|	diff2 \|	blob \| history