From 58a4cc53d6bfd76a385c5dcb2f9de8f617f8714a Mon Sep 17 00:00:00 2001
From: Zoe Roux <zoe.roux@zoriya.dev>
Date: Wed, 5 Feb 2025 15:10:26 +0100
Subject: [PATCH] Add gmm

---
 environments/server/default.nix | 2 +-
 modules/cli/zsh/default.nix     | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/environments/server/default.nix b/environments/server/default.nix
index 79e405b..12b9498 100644
--- a/environments/server/default.nix
+++ b/environments/server/default.nix
@@ -165,7 +165,7 @@ in {
       script-torrent-added-filename = "${guesspath}/bin/guesspath";
     };
   };
-  # Also allows transmission to reach thoses files
+  # Also allows transmission to reach theses files
   systemd.services.transmission.serviceConfig.BindPaths = [
     "/mnt/kyoo/downloads"
     "/mnt/kyoo/shows"
diff --git a/modules/cli/zsh/default.nix b/modules/cli/zsh/default.nix
index 5b6510d..93a5dfe 100644
--- a/modules/cli/zsh/default.nix
+++ b/modules/cli/zsh/default.nix
@@ -34,6 +34,7 @@
       gswm = "git switch $(git master)";
       grbm = "git rebase origin/$(git master)";
       grhhm = "grhh origin/$(git master)";
+      gmm = "git merge origin $(git master)";
       gcam = "git commit --amend";
       gcamn = "git commit --amend --no-edit";
       gcpf = "gaa && gcamn && gpf";