Commit 7844574d authored by mh's avatar mh
Browse files

don't edit the std. merge message

parent d44bf921
......@@ -55,7 +55,7 @@ function update_smf {
echo "Updating ${smf}"
find ${wwwdir} -user ${runuser} -print0 | xargs --no-run-if-empty -0 chmod g+w
find ${wwwdir} -user ${runuser} -print0 | xargs --no-run-if-empty -0 chown ${ftpuser}
run_cmd_as $ftpuser "cd ${wwwdir} && git pull && chmod -R g+w attachments avatars cache Packages Smileys Themes"
run_cmd_as $ftpuser "cd ${wwwdir} && git pull --no-edit && chmod -R g+w attachments avatars cache Packages Smileys Themes"
echo "Updating ${smf} done"
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment