Home

Using Bombay

Mapping a subdirectory of your project (libs/bombay in example) to bombay using Subtree Merging:

$ cd your_git_versioned_project_dir
$ git remote add bombay_remote git@github.com:sandeepshetty/bombay.git
$ git fetch bombay_remote
$ git checkout -b bombay bombay_remote/master
$ git checkout -f master
$ mkdir libs
$ git read-tree --prefix=libs/bombay/ -u bombay

Pull in upstream changes:

$ git checkout bombay
$ git pull

Merge changes back into your master branch:

$ git checkout master
$ git merge --squash -s subtree --no-commit bombay

References

• http://progit.org/book/ch6-7.html:
• http://help.github.com/subtree-merge/