From 04f4173d49f7c2d632f471bfbff5d90827753ef2 Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie.litherland-smith@ukaea.uk>
Date: Fri, 26 Jul 2024 09:16:16 +0100
Subject: [PATCH] git-sync-all: pull ff ~/.emacs.d/

---
 home/scripts/shell/git-sync-all.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/home/scripts/shell/git-sync-all.sh b/home/scripts/shell/git-sync-all.sh
index dada2c42..0cf9c369 100755
--- a/home/scripts/shell/git-sync-all.sh
+++ b/home/scripts/shell/git-sync-all.sh
@@ -1,8 +1,9 @@
-# Clone ~/.emacs.d/ if it doesn't exist
+# Clone ~/.emacs.d/ if it doesn't exist, fast-forward pull
 EMACS_DIR="$HOME/.emacs.d/"
 if [ ! -d "$EMACS_DIR" ]; then
     git clone "https://git.xenia.me.uk/pixelifytica/emacs.git" "$EMACS_DIR"
 fi
+git -C "$EMACS_DIR" pull --ff --ff-only
 
 # Sync common directories, setting url to ensure it's up-to-date first
 SYNC_DIRS=(