The
Pull command performs a
Fetch from a
StarTeam Server View and then performs a
merge/
rebase into the local
Master branch.
Arguments
- <starteam connection string>
- Connection string format:
[starteam://]<hostname>:<port>/<project name>[/<view name>][/<folder name>]
- <directory>
- Git working directory.
Options
- --auto-cache-agent
- Autolocate the Cache Agent to use while checking out the source code.
- --deep (-d)
- Performs a deep
fetch/pull/push, creating
commits in the
Git repository for each
StarTeam Change Package since the last
fetch. If the
deep option is not specified, then the collection of
StarTeam Change Packages will be grouped into a single
commit in
Git.
-
--eol (cr|lf|crlf|off|platform)
- Automatically convert the
end-of-line markers while checking out files from
StarTeam Server. The default is off, no end-of-line conversion is performed.
-
Note:
- Regardless of the
EOL setting in the file's properties in the
StarTeam Cross-Platform Client (Fixed CR\LF\CRLF,
Client defined), the
-eol cr,
lf, and
crlf value will always override that setting.
- When
-eol platform option is used then
pulled/fetched files will have the platform-specific EOL setting:
- Microsoft Windows:
CRLF.
- Linux:
- LF.
- Mac:
- CR.
- --force (-f)
- Performs a force
Fetch/Pull by downloading the latest Change Set.
- --help (-h)
- Command usage text.
- --password (-p) <password>
- StarTeam Password. If the password is not specified and has not been cached during previous commands then you will be prompted for a password.
- --quiet (-q)
- Progress is not reported.
- --rebase (-r)
- Incorporate changes by rebasing rather than merging.
- --shallow
- Creates a single
commit for all
StarTeam Change Packages in the
fetch.
- --strategy (-s) <strategy>
- The merge strategy to use. Valid
Git merge strategies such as
ours,
theirs and
resolve are supported.
- --use-cache-agent <host:port>
- Use Cache Agent
<host:port> while checking out the source code.
- --username (-u) <username>
- StarTeam user that will perform this operation. If the
StarTeam
User name is not specified during the
fetch/pull/push, then the user that was specified during the
clone will automatically be used.
- --verbose (-v)
- Verbose mode.
Example
This example
pulls the latest changes from
StarTeam Server to a configured
Git repository.
C:\gitdemo\Sample>git st pull
Followed by a prompt for password.