From afc0a14ded23a67f39311dbd3e67916725a69cba Mon Sep 17 00:00:00 2001
From: Jonathan Wood <bamblehorse@gmail.com>
Date: Wed, 16 Jan 2019 09:28:52 +0000
Subject: [PATCH] added git merge abort

---
 Cheatsheet.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Cheatsheet.md b/Cheatsheet.md
index 5ae2112..3f89d12 100644
--- a/Cheatsheet.md
+++ b/Cheatsheet.md
@@ -156,6 +156,7 @@ alias -g gp='| grep -i' #creates a global alias for grep
 | _glog_                 | git log --oneline --decorate --color --graph                                      |
 | _glp_                  | _git_log_prettily (git log --pretty=$1)                                           |
 | _gm_                   | git merge                                                                         |
+| _gma_                  | git merge --abort                                                                 |
 | _gmt_                  | git mergetool --no-prompt                                                         |
 | _gp_                   | git push                                                                          |
 | _gpoat_                | git push origin --all && git push origin --tags                                   |