diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-24 00:09:02 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-24 00:09:02 +0000 |
commit | 2ed3b0abccc8de391f1a9de2bc5785d3e0f5b018 (patch) | |
tree | fd6a1c298cb159656c72d622d5844fb55e191913 /doc/university/training | |
parent | 9083509f2f0e424b1d53cca4877d994d2050562b (diff) | |
download | gitlab-ce-2ed3b0abccc8de391f1a9de2bc5785d3e0f5b018.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/university/training')
-rw-r--r-- | doc/university/training/topics/subtree.md | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/doc/university/training/topics/subtree.md b/doc/university/training/topics/subtree.md index e1ee7b6a836..5b08832084c 100644 --- a/doc/university/training/topics/subtree.md +++ b/doc/university/training/topics/subtree.md @@ -11,11 +11,11 @@ comments: false ## Subtree Aliases -- Add: `git subtree add --prefix <target-folder> <url> <branch> --squash`. -- Pull: `git subtree add --prefix <target-folder> <url> <branch> --squash`. -- Push: `git subtree add --prefix <target-folder> <url> <branch>`. +- Add: `git subtree add --prefix <target-folder> <url> <branch> --squash` +- Pull: `git subtree pull --prefix <target-folder> <url> <branch> --squash` +- Push: `git subtree add --prefix <target-folder> <url> <branch>` - Ex: `git config alias.sbp 'subtree pull --prefix st / - git@gitlab.com:balameb/subtree-nested-example.git master --squash'`. + git@gitlab.com:balameb/subtree-nested-example.git master --squash'` ```shell # Add an alias |