From 183d1c66fca962bba829356ab1e468535de0d59d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20L=C3=BCscher?= Date: Sat, 4 May 2024 05:57:44 +0000 Subject: [PATCH] chore(devcontainer): vscode tasks for git cleanup --- .vscode/tasks.json | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/.vscode/tasks.json b/.vscode/tasks.json index c2da266..079835e 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -4,20 +4,9 @@ "version": "2.0.0", "tasks": [ { - "label": "Git: Fetch upstream", - "type": "shell", - "command": "git fetch upstream", - "options": { - "cwd": "${workspaceFolder}" - } - }, - { - "label": "Git: Merge from upstream", - "type": "shell", - "command": "git merge --no-ff --no-commit upstream/main", - "options": { - "cwd": "${workspaceFolder}" - } + "label": "Git: Cleanup", + "dependsOn": ["Git: Delete merged branches", "Git: Prune remote"], + "problemMatcher": [] }, { "label": "Git: Delete merged branches", @@ -35,5 +24,6 @@ "cwd": "${workspaceFolder}" } } - ] + ], + "inputs": [] }