summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorAlan Pearce2019-10-23 23:59:09 +0200
committerAlan Pearce2019-10-23 23:59:09 +0200
commitecd0980872ec23624a5871df7f86c6a9adad66fe (patch)
tree16568625b827604349c1c594d974fda8745aa515
parentd7b143945921b8a67da4b48d83d33f3c12fc393e (diff)
downloadnixfiles-ecd0980872ec23624a5871df7f86c6a9adad66fe.tar.lz
nixfiles-ecd0980872ec23624a5871df7f86c6a9adad66fe.tar.zst
nixfiles-ecd0980872ec23624a5871df7f86c6a9adad66fe.zip
zsh: add gm=git merge alias
-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";