From 03d4f4289cd50be38e736df7e25e9a3262d07097 Mon Sep 17 00:00:00 2001
From: Marc Beninca <git@marc.beninca.link>
Date: Sun, 17 Nov 2024 13:59:52 +0100
Subject: [PATCH] gm

---
 shell/alias/git.sh | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/shell/alias/git.sh b/shell/alias/git.sh
index cff9961..f043683 100644
--- a/shell/alias/git.sh
+++ b/shell/alias/git.sh
@@ -314,6 +314,15 @@ git_log_patch() {
 }
 glp() { git_log_patch "${@}"; }
 
+# fast-forward merge to remote branch
+git_merge() {
+	git \
+		merge \
+		--ff-only \
+		"${@}"
+}
+gm() { git_merge "${@}"; }
+
 # abort the current merge commit
 git_merge_abort() {
 	git \
@@ -333,14 +342,6 @@ git_merge_commit() {
 }
 gmc() { git_merge_commit "${@}"; }
 
-# fast-forward to remote branch
-gmf() {
-	git \
-		merge \
-		--ff-only \
-		"${@}"
-}
-
 # squash a branch and index its modifications
 gms() {
 	git \