search

twosigma / git-meta

Repository for the git-meta project -- build your own monorepo using Git submodules
http://twosigma.github.io/git-meta
BSD 3-Clause "New" or "Revised" License
220 stars 51 forks source link

fix merge to use a commit for submodules instead of HEAD so merge-bar… #740

Closed chaimmintz closed 4 years ago

chaimmintz commented 4 years ago

…e can find the submodules in the commits provided

Previously when doing a merge it will use the .gitmodules in HEAD to find submodules. However when merge-bare was used it wasn't able to find the submodules in the provided commits if they weren't in the HEAD's .gitmodules. This fixes it to use the target of the commits passed in to the merge-bare command to find the .gitsubmodules.