Skip to content

Commit

Permalink
Ensure Sublime config is valid JSON
Browse files Browse the repository at this point in the history
  • Loading branch information
Rypac committed Aug 12, 2024
1 parent 40788af commit 8a69c8f
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 13 deletions.
8 changes: 4 additions & 4 deletions sublime-merge/Commit.sublime-menu
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
"command": "show_command_palette",
"args": {
"command": "git",
"args": {"argv": ["rebase", "$commit~1", "--onto", "$select_branch"]},
},
"args": {"argv": ["rebase", "$commit~1", "--onto", "$select_branch"]}
}
},
{
"caption": "Start Interactive Rebase…",
"command": "git",
"args": {"argv": ["rebase", "-i", "$commit~1"]},
},
"args": {"argv": ["rebase", "-i", "$commit~1"]}
}
]
6 changes: 3 additions & 3 deletions sublime-merge/Default.sublime-commands
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
"args": { "argv": ["branch-clean"] }
},
{
"caption": "Rebase onto… ",
"caption": "Rebase onto…",
"command": "git",
"args": {"argv": ["rebase", "$select_branch", "--onto", "$select_branch"]},
},
"args": {"argv": ["rebase", "$select_branch", "--onto", "$select_branch"]}
}
]
2 changes: 1 addition & 1 deletion sublime-merge/Diff Context.sublime-menu
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@
{
"caption": "Blame",
"command": "blame", "args": { "path": "$path" }
},
}
]
2 changes: 1 addition & 1 deletion sublime-text/Default.sublime-commands
Original file line number Diff line number Diff line change
Expand Up @@ -88,5 +88,5 @@
{
"command": "switch_to_previous_window",
"caption": "Switch: To Previous Window"
},
}
]
7 changes: 3 additions & 4 deletions sublime-text/Preferences.sublime-settings
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,10 @@
"highlight_modified_tabs": true,
"translate_tabs_to_spaces": true,
"trim_trailing_white_space_on_save": "all",
"ignored_packages":
[
"ignored_packages": [
"NeoVintageous",
"Six",
"Vintage",
"Vintageous",
],
"Vintageous"
]
}

0 comments on commit 8a69c8f

Please sign in to comment.