add git reset --merge to the abort default action

phil294 · Sep 17, 2022 · 836debd · 836debd
1 parent a024c34
commit 836debd
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/package.json b/package.json
@@ -114,7 +114,7 @@
 						{
 							"title": "🛇",
 							"description": "Abort merge or cherry-pick",
-							"args": "merge --abort; git cherry-pick --abort",
+							"args": "merge --abort; git cherry-pick --abort; git reset --merge",
 							"immediate": true,
 							"ignore_errors": true
 						}