From 648cadf76b6967269ffce09606a30cbaf3dade63 Mon Sep 17 00:00:00 2001
From: pika <alex@team-pieck.de>
Date: Tue, 21 May 2024 11:29:58 +0200
Subject: [PATCH] minor changes

---
 config.fish | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config.fish b/config.fish
index 0e6dabf..e214837 100644
--- a/config.fish
+++ b/config.fish
@@ -192,6 +192,7 @@ end
 if command -v git >/dev/null 2>&1
     alias g='git'
     alias gs='git status'
+    alias gf='git fetch && git merge origin/main'
     alias gc='git clone'
     alias gsu='git submodule update --recursive && git submodule sync --recursive && git status'
     alias gsp='git pull --recurse-submodule --ff && git status'