aboutsummaryrefslogtreecommitdiff
path: root/scripts/upgrade
diff options
context:
space:
mode:
authornemsia <nemsia@nemsia.org>2018-04-06 13:28:33 +0200
committerGitHub <noreply@github.com>2018-04-06 13:28:33 +0200
commite29345e6b0ab4ab7e71d79f2680b0b01772a3570 (patch)
treeee7f010fd8a4a77a5d9d873db0a10e774e82fcc7 /scripts/upgrade
parentc8c2b68e50e54144ac939f11e0082905e4a37e42 (diff)
parentb13d9277a140b3e15252b6fe99c2b2c1b206bdd0 (diff)
downloadmastodon_ynh-e29345e6b0ab4ab7e71d79f2680b0b01772a3570.tar.gz
mastodon_ynh-e29345e6b0ab4ab7e71d79f2680b0b01772a3570.tar.bz2
mastodon_ynh-e29345e6b0ab4ab7e71d79f2680b0b01772a3570.zip
Merge pull request #16 from nemsia/upgrade-2.3.3
upgrade-2.3.3
Diffstat (limited to 'scripts/upgrade')
-rw-r--r--scripts/upgrade2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/upgrade b/scripts/upgrade
index 8e33ce8..50904f1 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -43,7 +43,7 @@ sudo chown -R $app: $final_path/live
# Download Mastodon
sudo su - $app <<PULLCOMMANDS
pushd ~/live
-git fetch
+git fetch -t
git reset --hard origin/master
git pull https://github.com/tootsuite/mastodon.git master
PULLCOMMANDS