From ecd0980872ec23624a5871df7f86c6a9adad66fe Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Wed, 23 Oct 2019 23:59:09 +0200
Subject: zsh: add gm=git merge alias

---
 user/settings/zsh.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'user/settings/zsh.nix')

diff --git a/user/settings/zsh.nix b/user/settings/zsh.nix
index c53d8a8e..79384634 100644
--- a/user/settings/zsh.nix
+++ b/user/settings/zsh.nix
@@ -197,6 +197,7 @@ in
       gk = "git push";
       gj = "git pull";
       gl = "git lg";
+      gm = "git merge";
       gr = "git remote";
       gz = "git stash";
       gzl = "git stash list";
-- 
cgit 1.4.1