]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 27c0f76 501770e)
Merge branch 'fg/submodule-git-file-git-dir'
authorJunio C Hamano <gitster@pobox.com>
Mon, 10 Oct 2011 22:56:16 +0000 (15:56 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 10 Oct 2011 22:56:17 +0000 (15:56 -0700)
commitefc5fb6a77780c53c6636326ca82ff87b17e4c5f
treedf55c7da6100b8b102b183dee72c9137b0d68075tree | snapshot
parent27c0f768843b6d844674f1fb8dc2676d830b56e3commit | diff
parent501770e1bb5d132ae4f79aa96715f07f6b84e1f6commit | 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
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
Unnamed repository; edit this file 'description' to name the repository.