knowledge
/
git-tips
mirror of https://github.com/namibia/tips.git
1
0
Fork 0
Code Issues Releases Activity

Updated title text

This commit is contained in:
Samar Panda 2015-09-02 20:21:18 +05:30
parent 8e73868075
commit 1f08b12668
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
README.md
View File

@ -57,8 +57,8 @@
* [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)
* [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. 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)
* [Adding a project to repo using subtree](https://github.com/git-tips/tips#adding-a-project-to-repo-using-subtree)
* [Get latest changes in your repo for a linked project using subtree](https://github.com/git-tips/tips#get-latest-changes-in-your-repo-for-a-linked-project-using-subtree)
<!-- 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 -->
@ -409,14 +409,14 @@ gitk --all
git subtree push --prefix subfolder_name origin gh-pages
```
## Adding a project to repo using subtree. For example we are adding in vendor directory
## Adding a project to repo using subtree
```sh
git subtree add --prefix=vendor/<project_name> --squash git@github.com:<username>/<project_name>.git master
git subtree add --prefix=<directory_name>/<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
## Get latest changes in your repo for a linked project using subtree
```sh
git subtree pull --prefix=vendor/<project_name> --squash git@github.com:<username>/<project_name>.git master
git subtree pull --prefix=<directory_name>/<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>. -->

8
tips.json
View File

@ -229,11 +229,11 @@
"alternatives": "git subtree push --prefix subfolder_name origin branch_name"
},
{
"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"
"title": "Adding a project to repo using subtree",
"tip": "git subtree add --prefix=<directory_name>/<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"
"title": "Get latest changes in your repo for a linked project using subtree",
"tip": "git subtree pull --prefix=<directory_name>/<project_name> --squash git@github.com:<username>/<project_name>.git master"
}
]