Junio C Hamano 5d0b5840c7 Merge branch 'jc/replacing' into next ...

* jc/replacing:
  read_sha1_file(): allow selective bypassing of replacement mechanism
  inline lookup_replace_object() calls
  read_sha1_file(): get rid of read_sha1_file_repl() madness
  t6050: make sure we test not just commit replacement
  Declare lookup_replace_object() in cache.h, not in commit.h

Conflicts:
	environment.c

2011-05-16 17:20:10 -07:00

5.5 KiB

Raw Blame History

View Raw