Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-05-02 22:41:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

git.pullFrom

Browse Source 
octopus commit
This commit is contained in:
Joao Moreno
2017-06-26 15:42:53 +02:00
parent 14380f9766 53ce1b0b46 5f31035e46
commit 417cdb62b7
5 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
extensions/git/src/git.ts
View File

@@ -751,19 +751,16 @@ export class Repository {
}
}
async pull(rebase?: boolean, remote?: string, name?: string): Promise<void> {
async pull(rebase?: boolean, remote?: string, branch?: string): Promise<void> {
const args = ['pull'];
if (rebase) {
args.push('-r');
}
if (remote) {
if (remote && branch) {
args.push(remote);
}
if (name) {
args.push(name);
args.push(branch);
}
try {