Search code examples
gitmergeversion-control

git: how to merge commits from a remote to a different path?

I have a git repository with remote foo.

foo is a web app, is contains some files and dirs directly in its root:

Rakefile
app
...
public
script

My main git repository is a larger system which comprises this web app. I want to pull the commits from foo, but I need the files to reside inside the web dir. So they should become web/app, web/public, etc.

I don't want to use foo as a submodule. I want to merge foo into the main repository and then get rid of it.

Solution

  • Here's a community-wiki version of your answer if you'd like to accept it as the answer.

    This answers my question:

    http://www.kernel.org/pub/software/scm/git/docs/howto/using-merge-subtree.html