Skip to content

Commit 196ae23

Browse files
axosoft-ramintd13
axosoft-ramint
authored and
d13
committed
Repositions "Recompose Commits" context menu command
1 parent 2df86b7 commit 196ae23

File tree

2 files changed

+26
-26
lines changed

2 files changed

+26
-26
lines changed

‎contributions.json‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3164,7 +3164,7 @@
31643164
{
31653165
"when": "webviewItem =~ /gitlens:branch\\b(?!.*?\\b\\+current\\b)/ && !gitlens:readonly && !gitlens:untrusted && !gitlens:hasVirtualFolders",
31663166
"group": "1_gitlens_actions_1",
3167-
"order": 2
3167+
"order": 3
31683168
}
31693169
]
31703170
}
@@ -3190,7 +3190,7 @@
31903190
{
31913191
"when": "webviewItem =~ /gitlens:branch\\b(?=.*?\\b\\+current\\b)(?=.*?\\b\\+tracking\\b)/ && !gitlens:readonly && !gitlens:untrusted && !gitlens:hasVirtualFolders",
31923192
"group": "1_gitlens_actions_1",
3193-
"order": 2
3193+
"order": 3
31943194
}
31953195
]
31963196
}
@@ -3293,7 +3293,7 @@
32933293
{
32943294
"when": "webviewItem =~ /gitlens:branch\\b/ && !gitlens:readonly && !gitlens:untrusted && !gitlens:hasVirtualFolders",
32953295
"group": "1_gitlens_actions_1",
3296-
"order": 3
3296+
"order": 4
32973297
}
32983298
]
32993299
}
@@ -4467,8 +4467,8 @@
44674467
"webview/context": [
44684468
{
44694469
"when": "webviewItem =~ /gitlens:branch\\b(?!.*?\\b\\+remote\\b)/ && !listMultiSelection && !gitlens:readonly && !gitlens:untrusted && gitlens:gk:organization:ai:enabled",
4470-
"group": "1_gitlens_ai",
4471-
"order": 15
4470+
"group": "1_gitlens_actions_1",
4471+
"order": 2
44724472
}
44734473
]
44744474
}
@@ -4480,8 +4480,8 @@
44804480
"view/item/context": [
44814481
{
44824482
"when": "viewItem =~ /gitlens:branch\\b(?!.*?\\b\\+remote\\b)/ && !listMultiSelection && !gitlens:readonly && !gitlens:untrusted && gitlens:gk:organization:ai:enabled",
4483-
"group": "1_gitlens_ai",
4484-
"order": 15
4483+
"group": "1_gitlens_actions_1",
4484+
"order": 2
44854485
}
44864486
]
44874487
}
@@ -11885,7 +11885,7 @@
1188511885
{
1188611886
"when": "viewItem =~ /gitlens:branch\\b(?!.*?\\b\\+current\\b)(?!.*?\\b\\+closed\\b)/ && !listMultiSelection && !gitlens:readonly && !gitlens:untrusted && !gitlens:hasVirtualFolders",
1188711887
"group": "1_gitlens_actions_1",
11888-
"order": 2
11888+
"order": 3
1188911889
}
1189011890
]
1189111891
}
@@ -11918,7 +11918,7 @@
1191811918
{
1191911919
"when": "viewItem =~ /gitlens:branch\\b(?=.*?\\b\\+current\\b)(?=.*?\\b\\+tracking\\b)(?!.*?\\b\\+closed\\b)/ && !listMultiSelection && !gitlens:readonly && !gitlens:untrusted && !gitlens:hasVirtualFolders",
1192011920
"group": "1_gitlens_actions_1",
11921-
"order": 2
11921+
"order": 3
1192211922
}
1192311923
]
1192411924
}
@@ -13321,7 +13321,7 @@
1332113321
{
1332213322
"when": "viewItem =~ /gitlens:branch\\b(?!.*?\\b\\+rebase\\b)/ && !listMultiSelection && !gitlens:readonly && !gitlens:untrusted && !gitlens:hasVirtualFolders",
1332313323
"group": "1_gitlens_actions_1",
13324-
"order": 3
13324+
"order": 4
1332513325
}
1332613326
]
1332713327
}

‎package.json‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -18662,20 +18662,25 @@
1866218662
"when": "viewItem =~ /gitlens:branch\\b(?!.*?\\b\\+current\\b)(?!.*?\\b\\+closed\\b)/ && !listMultiSelection && !gitlens:readonly && !gitlens:untrusted && !gitlens:hasVirtualFolders",
1866318663
"group": "1_gitlens_actions_1@1"
1866418664
},
18665+
{
18666+
"command": "gitlens.recomposeBranch:views",
18667+
"when": "viewItem =~ /gitlens:branch\\b(?!.*?\\b\\+remote\\b)/ && !listMultiSelection && !gitlens:readonly && !gitlens:untrusted && gitlens:gk:organization:ai:enabled",
18668+
"group": "1_gitlens_actions_1@2"
18669+
},
1866518670
{
1866618671
"command": "gitlens.views.rebaseOntoBranch",
1866718672
"when": "viewItem =~ /gitlens:branch\\b(?!.*?\\b\\+current\\b)(?!.*?\\b\\+closed\\b)/ && !listMultiSelection && !gitlens:readonly && !gitlens:untrusted && !gitlens:hasVirtualFolders",
18668-
"group": "1_gitlens_actions_1@2"
18673+
"group": "1_gitlens_actions_1@3"
1866918674
},
1867018675
{
1867118676
"command": "gitlens.views.rebaseOntoUpstream",
1867218677
"when": "viewItem =~ /gitlens:branch\\b(?=.*?\\b\\+current\\b)(?=.*?\\b\\+tracking\\b)(?!.*?\\b\\+closed\\b)/ && !listMultiSelection && !gitlens:readonly && !gitlens:untrusted && !gitlens:hasVirtualFolders",
18673-
"group": "1_gitlens_actions_1@2"
18678+
"group": "1_gitlens_actions_1@3"
1867418679
},
1867518680
{
1867618681
"command": "gitlens.views.resetToTip",
1867718682
"when": "viewItem =~ /gitlens:branch\\b(?!.*?\\b\\+rebase\\b)/ && !listMultiSelection && !gitlens:readonly && !gitlens:untrusted && !gitlens:hasVirtualFolders",
18678-
"group": "1_gitlens_actions_1@3"
18683+
"group": "1_gitlens_actions_1@4"
1867918684
},
1868018685
{
1868118686
"command": "gitlens.views.associateIssueWithBranch",
@@ -18737,11 +18742,6 @@
1873718742
"when": "viewItem =~ /gitlens:branch\\b/ && !listMultiSelection && !gitlens:readonly && !gitlens:untrusted && gitlens:gk:organization:ai:enabled",
1873818743
"group": "1_gitlens_ai@10"
1873918744
},
18740-
{
18741-
"command": "gitlens.recomposeBranch:views",
18742-
"when": "viewItem =~ /gitlens:branch\\b(?!.*?\\b\\+remote\\b)/ && !listMultiSelection && !gitlens:readonly && !gitlens:untrusted && gitlens:gk:organization:ai:enabled",
18743-
"group": "1_gitlens_ai@15"
18744-
},
1874518745
{
1874618746
"command": "gitlens.ai.explainUnpushed:views",
1874718747
"when": "viewItem =~ /gitlens:branch\\b(?=.*?\\b\\+ahead\\b)/ && !listMultiSelection && !gitlens:readonly && !gitlens:untrusted && gitlens:gk:organization:ai:enabled",
@@ -24679,20 +24679,25 @@
2467924679
"when": "webviewItem =~ /gitlens:branch\\b(?!.*?\\b\\+current\\b)/ && !gitlens:readonly && !gitlens:untrusted && !gitlens:hasVirtualFolders",
2468024680
"group": "1_gitlens_actions_1@1"
2468124681
},
24682+
{
24683+
"command": "gitlens.recomposeBranch:graph",
24684+
"when": "webviewItem =~ /gitlens:branch\\b(?!.*?\\b\\+remote\\b)/ && !listMultiSelection && !gitlens:readonly && !gitlens:untrusted && gitlens:gk:organization:ai:enabled",
24685+
"group": "1_gitlens_actions_1@2"
24686+
},
2468224687
{
2468324688
"command": "gitlens.graph.rebaseOntoBranch",
2468424689
"when": "webviewItem =~ /gitlens:branch\\b(?!.*?\\b\\+current\\b)/ && !gitlens:readonly && !gitlens:untrusted && !gitlens:hasVirtualFolders",
24685-
"group": "1_gitlens_actions_1@2"
24690+
"group": "1_gitlens_actions_1@3"
2468624691
},
2468724692
{
2468824693
"command": "gitlens.graph.rebaseOntoUpstream",
2468924694
"when": "webviewItem =~ /gitlens:branch\\b(?=.*?\\b\\+current\\b)(?=.*?\\b\\+tracking\\b)/ && !gitlens:readonly && !gitlens:untrusted && !gitlens:hasVirtualFolders",
24690-
"group": "1_gitlens_actions_1@2"
24695+
"group": "1_gitlens_actions_1@3"
2469124696
},
2469224697
{
2469324698
"command": "gitlens.graph.resetToTip",
2469424699
"when": "webviewItem =~ /gitlens:branch\\b/ && !gitlens:readonly && !gitlens:untrusted && !gitlens:hasVirtualFolders",
24695-
"group": "1_gitlens_actions_1@3"
24700+
"group": "1_gitlens_actions_1@4"
2469624701
},
2469724702
{
2469824703
"command": "gitlens.graph.associateIssueWithBranch",
@@ -24749,11 +24754,6 @@
2474924754
"when": "webviewItem =~ /gitlens:branch\\b/ && !listMultiSelection && !gitlens:readonly && !gitlens:untrusted && gitlens:gk:organization:ai:enabled",
2475024755
"group": "1_gitlens_ai@10"
2475124756
},
24752-
{
24753-
"command": "gitlens.recomposeBranch:graph",
24754-
"when": "webviewItem =~ /gitlens:branch\\b(?!.*?\\b\\+remote\\b)/ && !listMultiSelection && !gitlens:readonly && !gitlens:untrusted && gitlens:gk:organization:ai:enabled",
24755-
"group": "1_gitlens_ai@15"
24756-
},
2475724757
{
2475824758
"command": "gitlens.ai.explainUnpushed:graph",
2475924759
"when": "webviewItem =~ /gitlens:branch\\b(?=.*?\\b\\+ahead\\b)/ && !listMultiSelection && !gitlens:readonly && !gitlens:untrusted && gitlens:gk:organization:ai:enabled",

0 commit comments

Comments
 (0)