From c26dd3a65c72ddc84498ca76cf5e3025eec94315 Mon Sep 17 00:00:00 2001
From: SileNce5k <ozzynexus@gmail.com>
Date: Tue, 6 Jul 2021 15:27:16 +0200
Subject: [PATCH] Update:Fast forward only

Don't want to accidentally create merge commits and fuck up everything
---
 commands/update.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/commands/update.js b/commands/update.js
index d85490e..893707c 100644
--- a/commands/update.js
+++ b/commands/update.js
@@ -6,7 +6,7 @@ module.exports = {
 	description: 'pull changes from remote and reload commands with git',
 	admin: true,
 	execute({message, client}) { 
-		let cmd = "git pull";
+		let cmd = "git pull --ff-only";
 		const exec = require("child_process").exec;
 		exec(cmd, (err, stdout, stderr) => {
 			process.stdout.write(stdout);