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

Merge branch 'git-merge' of https://github.com/gecharo/vscode into gecharo-git-merge

Browse Source
This commit is contained in:
Joao Moreno
2017-06-26 09:56:42 +02:00
parent b84074b7b4 89cd05f877
commit f23a32b7a7
5 changed files with 50 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -654,6 +654,11 @@ export class Repository {
await this.run(args);
}
async merge(name: string): Promise<void> {
const args = ['merge', name];
await this.run(args);
}
async clean(paths: string[]): Promise<void> {
const pathsByGroup = groupBy(paths, p => path.dirname(p));
const groups = Object.keys(pathsByGroup).map(k => pathsByGroup[k]);