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

#10542 Ability to merge local git branches

Browse Source
This commit is contained in:
Rokas Gečas
2017-05-01 16:44:00 +03:00
parent e7ff4c373f
commit 818fa5a50f
5 changed files with 49 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -650,6 +650,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]);