fix: use ff-only mode.

DasLampe · Oct 24, 2023 · 106b4ce · 106b4ce
1 parent 089acf0
commit 106b4ce
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/Makefile b/Makefile
@@ -19,7 +19,7 @@ link:
 	ln -s $(current_dir)/tilix/schemes/catppuccin/src/Catppuccin-Mocha.json ~/.config/tilix/schemes/Catppuccin-Mocha.json
 
 update:
-	git pull origin $$(git branch --show-current)
+	git pull origin $$(git branch --show-current) --ff-only
 	git submodule update --init
 	vim -c "PlugUpgrade|PlugUpdate|PlugInstall|q|q"