Merge branch 'jk/git-dir-lookup' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 21 Feb 2012 23:13:16 +0000 (15:13 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 21 Feb 2012 23:13:16 +0000 (15:13 -0800)
* jk/git-dir-lookup:
  standardize and improve lookup rules for external local repos

1  2 
builtin/clone.c
cache.h

diff --cc builtin/clone.c
Simple merge
diff --cc cache.h
Simple merge