From e030342ca5e52f6029ca3794ef8a7d231a2e9cf8 Mon Sep 17 00:00:00 2001
From: Jan Andrle <andrle.jan@centrum.cz>
Date: Tue, 20 Aug 2024 16:56:41 +0200
Subject: [PATCH] :zap: Sublime Merge small improvements

---
 .../Packages/User/Default (Linux).sublime-commands         | 7 +++++++
 .../Packages/User/Preferences.sublime-settings             | 1 +
 2 files changed, 8 insertions(+)

diff --git a/.config/sublime-merge/Packages/User/Default (Linux).sublime-commands b/.config/sublime-merge/Packages/User/Default (Linux).sublime-commands
index 72edc32..87ca630 100644
--- a/.config/sublime-merge/Packages/User/Default (Linux).sublime-commands	
+++ b/.config/sublime-merge/Packages/User/Default (Linux).sublime-commands	
@@ -21,4 +21,11 @@
 		"command": "git",
 		"args": { "argv": [ "browse" ] }
 	},
+	{
+		"caption": "Branch -D --all (delete remote and local branch)",
+		"command": "delete_branch",
+		"args": {
+			"argv": [ true, true, true ]
+		}
+	}
 ]
diff --git a/.config/sublime-merge/Packages/User/Preferences.sublime-settings b/.config/sublime-merge/Packages/User/Preferences.sublime-settings
index c0303ea..e2c94d1 100644
--- a/.config/sublime-merge/Packages/User/Preferences.sublime-settings
+++ b/.config/sublime-merge/Packages/User/Preferences.sublime-settings
@@ -8,4 +8,5 @@
 	"side_bar_layout": "tabs",
 	"signature_error_highlighting": "no_public_key",
 	"theme": "Merge Dark.sublime-theme",
+	"expand_merge_commits_by_default": true,
 }