Merge branch 'fg/submodule-git-file-git-dir'

* fg/submodule-git-file-git-dir: Move git-dir for submodules rev-parse: add option --resolve-git-dir <path> Conflicts: cache.h git-submodule.sh

Junio C Hamano committed Oct 10, 2011 at 15:56 UTC efc5fb6a77780c53c6636326ca82ff87b17e4c5f

No changes.