From 5aa02e346a8f8080bef7a817fe0789e990d9b787 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Sat, 20 Nov 2021 16:43:03 -0500 Subject: [PATCH] update will now pull down the latest changes via git next up is schema upgrades between commits --- post.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/post.php b/post.php index 66891501..1031c217 100644 --- a/post.php +++ b/post.php @@ -847,8 +847,13 @@ if(isset($_GET['download_database'])){ } if(isset($_GET['update'])){ - //Stuff will go here.. //also check to make sure someone has admin before running this function + exec("git pull"); + + //git fetch downloads the latest from remote without trying to merge or rebase anything. Then the git reset resets the master branch to what you just fetched. The --hard option changes all the files in your working tree to match the files in origin/master + + //exec("git fetch --all"); + //exec("git reset --hard origin/master"); }