Merge branch 'jc/maint-rerere-in-workdir'
authorJunio C Hamano <gitster@pobox.com>
Sun, 27 Mar 2011 03:13:16 +0000 (20:13 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 27 Mar 2011 03:13:16 +0000 (20:13 -0700)
commitad7bb2f68c0b7786521173e05ef58d0f3e0db3d7
tree9fc6b2df2743b837f774c0ce925cdad2427c4535
parent54f6a8dbd65cbe6ad31a8b6b531de81009514eb3
parent90a6464b4ad5887e4d12e660f51dabdbd5c00812
Merge branch 'jc/maint-rerere-in-workdir'

* jc/maint-rerere-in-workdir:
  rerere: make sure it works even in a workdir attached to a young repository
cache.h
rerere.c
sha1_file.c