Skip to content

Commit

Permalink
chore(devcontainer): vscode tasks for git cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
tepene committed May 4, 2024
1 parent deff486 commit 183d1c6
Showing 1 changed file with 5 additions and 15 deletions.
20 changes: 5 additions & 15 deletions .vscode/tasks.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -35,5 +24,6 @@
"cwd": "${workspaceFolder}"
}
}
]
],
"inputs": []
}

0 comments on commit 183d1c6

Please sign in to comment.