git-submod-enhancements icon indicating copy to clipboard operation
git-submod-enhancements copied to clipboard
verified publisher icon jlehmann

Is submodule-aware `git merge` out of the question?

Open vi opened this issue 8 years ago • 2 comments

As an easy start, it can handle fast-forward merges in submodules. Ultimately it can do fully-fledged merges and create special refs for them.

vi avatar Mar 14 '17 21:03 vi

create special refs for them.

What is the purpose of these special refs? (Are they in the superproject or in the submodule?)

stefanbeller avatar Mar 15 '17 03:03 stefanbeller

In the submodule, to automatically bring the non-forward submodule merge to superproject without touching any actual branches in the submodule.

vi avatar Mar 15 '17 11:03 vi