add git rebase --abort to the abort action

phil294 · Jan 16, 2023 · cbbd17c · cbbd17c
1 parent 9ca9296
commit cbbd17c
Showing 1 changed file with 2 additions and 2 deletions.
diff --git 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
 						}