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

Git - Add merge abort command (#159753)

Browse Source 
* Add merge abort command

* Pull request feedback
This commit is contained in:
Ladislau Szomoru
2022-09-07 15:06:20 +02:00
committed by GitHub
parent c6fd3c9c17
commit 1e99736c27
6 changed files with 43 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
extensions/git/package.json
View File

@@ -369,6 +369,11 @@
"title": "%command.merge%",
"category": "Git"
},
{
"command": "git.mergeAbort",
"title": "%command.mergeAbort%",
"category": "Git"
},
{
"command": "git.rebase",
"title": "%command.rebase%",
@@ -898,6 +903,10 @@
"command": "git.merge",
"when": "config.git.enabled && !git.missing && gitOpenRepositoryCount != 0"
},
{
"command": "git.mergeAbort",
"when": "config.git.enabled && !git.missing && gitOpenRepositoryCount != 0 && gitMergeInProgress"
},
{
"command": "git.rebase",
"when": "config.git.enabled && !git.missing && gitOpenRepositoryCount != 0"