On Wed, Dec 4, 2013 at 6:01 PM, Martin Langhoff
<martin.langhoff@xxxxxxxxx> wrote:
> Is there a reasonable approach to scripting this?
Found my answers.
The 'subtree' merge strategy is smart enough to "mostly" help here.
However, it does not handle new files created in the subdirectory.
My workflow is this one. It is similar to the recipes for the subtree
merge strategies, but invoking git mv to pull files out of the
git merge -s ours --no-commit upstream/branch
git read-tree --prefix= -u upstream/branch
git mv mysubdir/* ./ ### read-tree can't do this
git commit
... time passes
git merge -s subtree --no-commit upstream/branch
if [ -d mysubdir ]; then
# handle new files
git mv mysubdir/* ./
fi
git commit
glad that I ended up reading a lot about subtree.
cheers,
m
--
martin.langhoff@xxxxxxxxx
- ask interesting questions
- don't get distracted with shiny stuff - working code first
~ http://docs.moodle.org/en/User:Martin_Langhoff
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html