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

Git - improve reference comparison commands (#274143)

Browse Source 
* Git - improve compare commands

* Remove an extra check

* Fix bad manual merge
This commit is contained in:
Ladislau Szomoru
2025-10-30 17:00:30 +00:00
committed by GitHub
parent a4f5e37711
commit f46638bfc7
3 changed files with 63 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
extensions/git/package.json
View File

@@ -1005,6 +1005,12 @@
"category": "Git",
"enablement": "!operationInProgress"
},
{
"command": "git.graph.compareWithRemote",
"title": "%command.graphCompareWithRemote%",
"category": "Git",
"enablement": "!operationInProgress && scmCurrentHistoryItemRefHasRemote"
},
{
"command": "git.graph.compareWithMergeBase",
"title": "%command.graphCompareWithMergeBase%",
@@ -1622,6 +1628,10 @@
"command": "git.graph.compareWithMergeBase",
"when": "false"
},
{
"command": "git.graph.compareWithRemote",
"when": "false"
},
{
"command": "git.diff.stageHunk",
"when": "config.git.enabled && !git.missing && gitOpenRepositoryCount != 0 && diffEditorOriginalUri =~ /^git\\:.*%22ref%22%3A%22~%22%7D$/"
@@ -2264,15 +2274,20 @@
"group": "4_modify@1"
},
{
"command": "git.graph.compareRef",
"command": "git.graph.compareWithRemote",
"when": "scmProvider == git",
"group": "5_compare@1"
},
{
"command": "git.graph.compareWithMergeBase",
"when": "scmProvider == git && scmHistoryItemHasCurrentHistoryItemRef",
"when": "scmProvider == git",
"group": "5_compare@2"
},
{
"command": "git.graph.compareRef",
"when": "scmProvider == git",
"group": "5_compare@3"
},
{
"command": "git.copyCommitId",
"when": "scmProvider == git && !listMultiSelection",