From cbbd17ccd7cb5ef095ee55e8e3fcb0249d0c077a Mon Sep 17 00:00:00 2001
From: phil294 <philip@waritschlager.de>
Date: Mon, 16 Jan 2023 04:20:40 +0100
Subject: [PATCH] add `git rebase --abort` to the abort action

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 547553e..86feffc 100644
--- a/package.json
+++ b/package.json
@@ -132,8 +132,8 @@
 						{
 							"title": "",
 							"icon": "circle-slash",
-							"description": "Abort merge or cherry-pick",
-							"args": "merge --abort; git cherry-pick --abort; git reset --merge",
+							"description": "Abort the current merge or cherry-pick or rebase, if present.",
+							"args": "merge --abort; git cherry-pick --abort; git rebase --abort; git reset --merge",
 							"immediate": true,
 							"ignore_errors": true
 						}