Add folders to the project and remove redundant merge command

This commit is contained in:
Amelia A 2023-01-07 19:10:40 -08:00
parent 26764e898b
commit 6edb4ffcfc
Signed by: amy
SSH Key Fingerprint: SHA256:qBZcJvigz/2V1hkfVzAi8HqF6mV2YpjkcIaZ8CB04rU
2 changed files with 10 additions and 6 deletions

View File

@ -20,14 +20,9 @@
"command": "git",
"args": {"argv": ["switch", "--force-create", "$text"]}
},
{
"caption": "Interactive rebase onto main",
"command": "git",
"args": {"argv": ["rebase", "--interactive", "main"]}
},
// Custom command in .gitconfig
{
"caption": "Clean (wipe) all branches",
"caption": "Clean (wipe) All Branches",
"command": "git",
"args": {"argv": ["wipe"]}
},

View File

@ -1,8 +1,17 @@
{
"folders": [
{
"name": "Sublime Dotfile",
"path": "."
},
{
"name": "Sublime-Text Packages",
"path": "/Users/dos/Library/Application Support/Sublime Text/Packages"
},
{
"name": "Sublime-Merge Packages",
"path": "/Users/dos/Library/Application Support/Sublime Merge/Packages"
}
],
"settings": {
"lsp_format_on_save": false,