Merge pull request #8 from xnivaxhzne/master

Master -> Production

Author: xnivaxhzne

README.md

@@ -31,6 +31,7 @@ npm i -g @xniva/git-shortcuts
 | `glp`            | `git show-branch --no-name HEAD`                                       | Print the last commit message                                  |
 | `glc`            | `git show-branch --no-name HEAD`                                       | Copy and Print the last commit message                         |
 | `gsf`            | `gcm  && gpm && git merge --no-commit --no-ff origin/${featureBranch}` | List the changes of a feature branch w.r.t master - for review |
+| `gma`            | `git merge --abort`                                                    | Abort the merge                                                |
 
 ### Master branch name is configurable:
 

bin/git_merge_abort.js

@@ -0,0 +1,4 @@
+#! /usr/bin/env node
+import main from "../lib/git_merge_abort/index.js";
+
+main();

lib/git_merge_abort/index.js

@@ -0,0 +1,7 @@
+import runCommand from "./../utils/run_command.js";
+
+const main = () => {
+  runCommand("git merge --abort");
+};
+
+export default main;

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@xniva/git-shortcuts",
-  "version": "1.4.0",
+  "version": "1.5.0",
   "description": "Shortcuts for the commonly used git commands",
   "repository": "https://github.com/kavinkuma6/git-shortcuts",
   "bin": {
@@ -17,7 +17,8 @@
     "glp": "bin/git_print_last_commit_message.js",
     "glc": "bin/git_print_copy_last_commit_message.js",
     "gr": "bin/git_restore.js",
-    "gsf": "bin/git_see_feature_files.js"
+    "gsf": "bin/git_see_feature_files.js",
+    "gma": "bin/git_merge_abort.js"
   },
   "author": "Kavinkumar R",
   "license": "MIT",