mirror of
https://github.com/ublue-os/forge.git
synced 2025-04-21 05:53:45 +03:00
chore(devcontainer): vscode tasks for git cleanup
This commit is contained in:
parent
deff486eaf
commit
183d1c66fc
20
.vscode/tasks.json
vendored
20
.vscode/tasks.json
vendored
|
@ -4,20 +4,9 @@
|
||||||
"version": "2.0.0",
|
"version": "2.0.0",
|
||||||
"tasks": [
|
"tasks": [
|
||||||
{
|
{
|
||||||
"label": "Git: Fetch upstream",
|
"label": "Git: Cleanup",
|
||||||
"type": "shell",
|
"dependsOn": ["Git: Delete merged branches", "Git: Prune remote"],
|
||||||
"command": "git fetch upstream",
|
"problemMatcher": []
|
||||||
"options": {
|
|
||||||
"cwd": "${workspaceFolder}"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"label": "Git: Merge from upstream",
|
|
||||||
"type": "shell",
|
|
||||||
"command": "git merge --no-ff --no-commit upstream/main",
|
|
||||||
"options": {
|
|
||||||
"cwd": "${workspaceFolder}"
|
|
||||||
}
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"label": "Git: Delete merged branches",
|
"label": "Git: Delete merged branches",
|
||||||
|
@ -35,5 +24,6 @@
|
||||||
"cwd": "${workspaceFolder}"
|
"cwd": "${workspaceFolder}"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
]
|
],
|
||||||
|
"inputs": []
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue