![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 10 Oct 2011 22:56:16 +0000 (15:56 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 10 Oct 2011 22:56:17 +0000 (15:56 -0700) | ||
| commit | efc5fb6a77780c53c6636326ca82ff87b17e4c5f | |
| tree | df55c7da6100b8b102b183dee72c9137b0d68075 | tree | snapshot |
| parent | 27c0f768843b6d844674f1fb8dc2676d830b56e3 | commit | diff |
| parent | 501770e1bb5d132ae4f79aa96715f07f6b84e1f6 | commit | diff |
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
* 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
| cache.h | diff1 | | diff2 | | blob | history |
| git-submodule.sh | diff1 | | diff2 | | blob | history |
| setup.c | diff1 | | diff2 | | blob | history |
| t/t7400-submodule-basic.sh | diff1 | | diff2 | | blob | history |