Marown/tips
1
0
Fork 0
mirror of https://github.com/git-tips/tips.git synced 2024-09-22 00:01:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

pull changes of subproject using git subtree

Browse Source
This commit is contained in:
Samar Panda 2015-09-02 20:10:26 +05:30
parent b31618b975
commit 8e73868075
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
README.md
View File

@ -57,7 +57,8 @@
* [Retrieve the commit hash of the initial revision.](https://github.com/git-tips/tips#retrieve-the-commit-hash-of-the-initial-revision) * [Retrieve the commit hash of the initial revision.](https://github.com/git-tips/tips#retrieve-the-commit-hash-of-the-initial-revision)
* [Visualize the version tree.](https://github.com/git-tips/tips#visualize-the-version-tree) * [Visualize the version tree.](https://github.com/git-tips/tips#visualize-the-version-tree)
* [Deploying git tracked subfolder to gh-pages](https://github.com/git-tips/tips#deploying-git-tracked-subfolder-to-gh-pages) * [Deploying git tracked subfolder to gh-pages](https://github.com/git-tips/tips#deploying-git-tracked-subfolder-to-gh-pages)
* [Adding a project to repo using subtree. Lets say we are adding in vendor directory](https://github.com/git-tips/tips#adding-a-project-to-repo-using-subtree-lets-say-we-are-adding-in-vendor-directory) * [Adding a project to repo using subtree. For example we are adding in vendor directory](https://github.com/git-tips/tips#adding-a-project-to-repo-using-subtree-for-example-we-are-adding-in-vendor-directory)
* [Get latest changes in your repo for a linked subproject using subtree. For example we have the subproject in vendor directory](https://github.com/git-tips/tips#get-latest-changes-in-your-repo-for-a-linked-subproject-using-subtree-for-example-we-have-the-subproject-in-vendor-directory)
<!-- Don’t remove or change the comment below – that can break automatic updates. More info at <http://npm.im/doxie.inject>. --> <!-- Don’t remove or change the comment below – that can break automatic updates. More info at <http://npm.im/doxie.inject>. -->
<!-- @doxie.inject end toc --> <!-- @doxie.inject end toc -->
@ -408,10 +409,15 @@ gitk --all
git subtree push --prefix subfolder_name origin gh-pages git subtree push --prefix subfolder_name origin gh-pages
``` ```
## Adding a project to repo using subtree. Lets say we are adding in vendor directory ## Adding a project to repo using subtree. For example we are adding in vendor directory
```sh ```sh
git subtree add --prefix=vendor/<project_name> --squash git@github.com:<username>/<project_name>.git master git subtree add --prefix=vendor/<project_name> --squash git@github.com:<username>/<project_name>.git master
``` ```
## Get latest changes in your repo for a linked subproject using subtree. For example we have the subproject in vendor directory
```sh
git subtree pull --prefix=vendor/<project_name> --squash git@github.com:<username>/<project_name>.git master
```
<!-- Don’t remove or change the comment below – that can break automatic updates. More info at <http://npm.im/doxie.inject>. --> <!-- Don’t remove or change the comment below – that can break automatic updates. More info at <http://npm.im/doxie.inject>. -->
<!-- @doxie.inject end --> <!-- @doxie.inject end -->

6
tips.json
View File

@ -229,7 +229,11 @@
"alternatives": "git subtree push --prefix subfolder_name origin branch_name" "alternatives": "git subtree push --prefix subfolder_name origin branch_name"
}, },
{ {
"title": "Adding a project to repo using subtree. Lets say we are adding in vendor directory", "title": "Adding a project to repo using subtree. For example we are adding in vendor directory",
"tip": "git subtree add --prefix=vendor/<project_name> --squash git@github.com:<username>/<project_name>.git master" "tip": "git subtree add --prefix=vendor/<project_name> --squash git@github.com:<username>/<project_name>.git master"
},
{
"title": "Get latest changes in your repo for a linked subproject using subtree. For example we have the subproject in vendor directory",
"tip": "git subtree pull --prefix=vendor/<project_name> --squash git@github.com:<username>/<project_name>.git master"
} }
] ]