From e74417219cb02ff528a04e948f0184e706df81d3 Mon Sep 17 00:00:00 2001
From: ItsDrike <itsdrikeofficial@gmail.com>
Date: Tue, 20 Jul 2021 01:36:23 +0200
Subject: [PATCH] Add git merge alias

---
 home/.config/shell/aliases | 1 +
 1 file changed, 1 insertion(+)

diff --git a/home/.config/shell/aliases b/home/.config/shell/aliases
index 35f5d65..ac28d7e 100755
--- a/home/.config/shell/aliases
+++ b/home/.config/shell/aliases
@@ -176,6 +176,7 @@ alias cleanup='clean-trash && clean-down && clean-journal && clean-pacman'
 alias g='git'
 alias gs='git status'
 alias gd='git diff'
+alias gm='git merge'
 alias ga='git add'
 alias gaa='git add all'
 alias gc='git commit'