Commit d82de37c authored by anarcat's avatar anarcat

rebase instead of just pull

parent 1f352626
......@@ -66,7 +66,8 @@ if ! prompt_yes_no "continue?" ; then
exit 1
fi
git pull
git pull --rebase
echo changing makefile to download tarball
#sed -i'.tmp' -e'/^projects\[hostmaster\]\[download\]\[type\]/s/=.*$/ = "get"/' \
# -e'/^projects\[hostmaster\]\[download\]\[url\]/s#=.*$#= "http://ftp.drupal.org/files/projects/hostmaster-'$version'.tgz"#' \
......
Markdown is supported
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