From 81695100d2e646b0e7dbbcfcdc4c42db9392451b Mon Sep 17 00:00:00 2001
From: Adrian Abeyta <adrian@abeyta.earth>
Date: Tue, 4 Aug 2026 17:16:38 -0600
Subject: [PATCH] add git merge alias

---
 git/.gitconfig | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/git/.gitconfig b/git/.gitconfig
index 157f8a4..fe49320 100644
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -16,6 +16,8 @@
 
         f = fetch --all
 
+        m = merge
+
         p = push
 	pf = push --force-with-lease