Sublime Merge

This commit is contained in:
Jan Andrle 2024-08-02 13:05:16 +02:00
parent bdada371e1
commit 6c44573c6c
Signed by: jaandrle
GPG Key ID: B3A25AED155AFFAB
8 changed files with 226 additions and 0 deletions

Binary file not shown.

View File

@ -0,0 +1,173 @@
{
"last_version": 2096,
"new_window_session":
{
"window_height": 1026.0,
"window_width": 1277.0
},
"next_update_check": 1722593273,
"project_dir": "/home/jaandrle",
"recent":
[
{
"expanded_refs":
{
"refs/remotes": true,
"refs/remotes/origin": true,
"refs/tags": true
},
"locations_tab_selected": false,
"path": "/home/jaandrle/Vzdálené/GitHub/DGF-Certified-Supervisory-Academy",
"previous_commit_messages":
[
":zap: initial\n",
":tv: updated texts labels\n",
":zap: transl done\n",
":zap: launch/he - ammends\n"
],
"search":
{
"history":
[
]
},
"show_untracked_files": false,
"side_bar_visible": true,
"sidebar":
{
"lhs_widths":
[
287.0,
408.0,
300.0
]
},
"table_of_contents_tab_selected": false,
"table_of_contents_tree_mode": false
},
{
"locations_tab_selected": false,
"path": "/home/jaandrle/Vzdálené/GitHub/epubArticles",
"previous_commit_messages":
[
":heavy_minus_sign:\n",
"init\n"
],
"search":
{
"history":
[
]
},
"show_untracked_files": false,
"side_bar_visible": true,
"sidebar":
{
"lhs_widths":
[
315.0
]
},
"table_of_contents_tab_selected": false,
"table_of_contents_tree_mode": false
},
{
"locations_tab_selected": false,
"path": "/home/jaandrle/Vzdálené/GitHub/DGF-Certified-Supervisory-Academy/build/gulp/submodule_gulp",
"previous_commit_messages":
[
],
"search":
{
"history":
[
]
},
"show_untracked_files": false,
"side_bar_visible": true,
"sidebar":
{
"lhs_widths":
[
315.0
]
},
"table_of_contents_tab_selected": false,
"table_of_contents_tree_mode": false
},
{
"expanded_refs":
{
"refs/remotes": true,
"refs/remotes/origin": true,
"submodules": true
},
"locations_tab_selected": false,
"path": "/home/jaandrle/Vzdálené/GitHub/DHLC-Internet-Networking-old",
"previous_commit_messages":
[
],
"search":
{
"history":
[
]
},
"show_untracked_files": false,
"side_bar_visible": true,
"sidebar":
{
"lhs_widths":
[
304.0,
298.0,
300.0
]
},
"table_of_contents_filter_visible": true,
"table_of_contents_tab_selected": false,
"table_of_contents_tree_mode": false
},
{
"locations_tab_selected": false,
"path": "/home/jaandrle/Vzdálené/GitHub/DHLC-Internet-Networking-old/web/api/rest/_internal",
"previous_commit_messages":
[
],
"search":
{
"history":
[
]
},
"show_untracked_files": false,
"side_bar_visible": true,
"sidebar":
{
"lhs_widths":
[
192.0,
306.0,
300.0
]
},
"table_of_contents_tab_selected": false,
"table_of_contents_tree_mode": false
}
],
"select_repository":
{
"height": 0.0,
"last_filter": "",
"selected_items":
[
],
"width": 0.0
},
"window_positions":
{
},
"windows":
[
]
}

View File

@ -0,0 +1,6 @@
// Settings in here override those in "Default/Preferences.sublime-settings",
// and are overridden in turn by syntax-specific settings.
{
"theme": "Merge Dark.sublime-theme",
"hardware_acceleration": "opengl",
}

View File

@ -0,0 +1,3 @@
{
"spell_check": false
}

View File

@ -0,0 +1,24 @@
// https://github.com/Sublime-Instincts/CommandsBrowser/tree/master/sm_commands_metadata
[
{
"caption": "Switch…",
"command": "checkout_branch",
},
{
"caption": "Switch -C…",
"command": "create_branch",
},
{
"caption": "Checkout -B…",
"command": "create_branch",
},
{
"caption": "Commit…",
"command": "commit",
},
{
"caption": "Browse repository",
"command": "git",
"args": { "argv": [ "browse" ] }
},
]

View File

@ -0,0 +1,6 @@
[
{
"keys": ["ctrl+;"],
"command": "show_command_palette"
},
]

View File

@ -0,0 +1,3 @@
{
"draw_white_space": "all"
}

View File

@ -0,0 +1,11 @@
// Settings in here override those in "Default/Preferences.sublime-settings",
// and are overridden in turn by syntax-specific settings.
{
"hardware_acceleration": "opengl",
"diff_algorithm": "match_git",
"diff_style": "auto",
"font_face": "Ubuntu Mono",
"side_bar_layout": "tabs",
"signature_error_highlighting": "no_public_key",
"theme": "Merge Dark.sublime-theme",
}