From 2ed3b0abccc8de391f1a9de2bc5785d3e0f5b018 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Mon, 24 Feb 2020 00:09:02 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- doc/university/training/topics/subtree.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'doc/university/training') 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 --squash`. -- Pull: `git subtree add --prefix --squash`. -- Push: `git subtree add --prefix `. +- Add: `git subtree add --prefix --squash` +- Pull: `git subtree pull --prefix --squash` +- Push: `git subtree add --prefix ` - 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 -- cgit v1.2.1