From: Junio C Hamano Date: Tue, 3 Nov 2015 23:32:34 +0000 (-0800) Subject: Merge branch 'mk/submodule-gitdir-path' into maint X-Git-Tag: v2.6.3~23 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1bf986bc9c1e823da27465bfd9faf2b725bbcc09;p=thirdparty%2Fgit.git Merge branch 'mk/submodule-gitdir-path' into maint The submodule code has been taught to work better with separate work trees created via "git worktree add". * mk/submodule-gitdir-path: path: implement common_dir handling in git_pathdup_submodule() submodule refactor: use strbuf_git_path_submodule() in add_submodule_odb() --- 1bf986bc9c1e823da27465bfd9faf2b725bbcc09