summary refs log tree commit diff stats
path: root/user/settings/zsh.nix
diff options
context:
space:
mode:
Diffstat (limited to 'user/settings/zsh.nix')
-rw-r--r--user/settings/zsh.nix1
1 files changed, 1 insertions, 0 deletions
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";