Pull command
git-pull - Fetch from StarTeam view and integrate with another repository or a local branch.
Supported pull options:
--commit
--no-commit
--edit
-e
--no-edit
--ff
--no-ff
--ff-only
--squash
--no-squash
-s (--strategy)
-X <option>
--strategy-option=<option>
-r
--rebase[=false|true|preserve|interactive]
--no-rebase
--autostash
--no-autostash
--prune
--no-tags
Unsupported options:
--depth=<depth>
--deepen=<depth>
--shallow-since=<date>
--shallow-exclude=<revision>
--unshallow
Sample 1
The following command pulls changes from StarTeam 2.0 view into the current branch in Git.
C:\gitdemo\jars1>git pull origin 2.0 Connect to StarTeam server:done Fetching from StarTeam server From starteam://localhost:49201/GitProject * branch 2.0 -> FETCH_HEAD Updating 6f6237e..5bb59ee Fast-forward StarTeam 3rd Party License.txt | 23569 --------------------------------------- 1 file changed, 23569 deletions(-) delete mode 100644 StarTeam 3rd Party License.txt
Sample 2
The following command pulls changes from main view and 1.0 view in StarTeam into the current branch in Git.
C:\gitdemo\jars1>git pull origin master 1.0 Connect to StarTeam server:done Fetching from StarTeam server From starteam://localhost:49201/GitProject * branch master -> FETCH_HEAD * branch 1.0 -> FETCH_HEAD Removing StSDKLoader_64.dll Merge made by the 'recursive' strategy. StSDKLoader_64.dll | Bin 2334208 -> 0 bytes build_server.xml | 2 +- buildinfo.properties | 4 ++-- doc/setup/graphic/starteam.ico | Bin 0 -> 894 bytes doc/setup/lib/iaant.jar | Bin 0 -> 10322 bytes 5 files changed, 3 insertions(+), 3 deletions(-) delete mode 100644 StSDKLoader_64.dll create mode 100644 doc/setup/graphic/starteam.ico create mode 100644 doc/setup/lib/iaant.jar
Sample 3
The following command would remove any remote tracking references that no longer exist on the StarTeam Server.
C:\gitdemo\jars3>git pull --prune Connect to StarTeam server:done From starteam://localhost:49201/GitProject - [deleted] (none) -> origin/Sandbox Fetching from StarTeam server Already up-to-date.