Merge branch 'jk/git-dir-lookup'
authorJunio C Hamano <gitster@pobox.com>
Tue, 14 Feb 2012 20:57:18 +0000 (12:57 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 14 Feb 2012 20:57:18 +0000 (12:57 -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