Merge branch '2.1' of github.com:imathis/octopress into 2.1

This commit is contained in:
Brandon Mathis 2012-05-27 02:32:58 -05:00
commit ec900d5af7

View File

@ -295,7 +295,7 @@ multitask :push do
puts "\n## copying #{public_dir} to #{deploy_dir}" puts "\n## copying #{public_dir} to #{deploy_dir}"
cp_r "#{public_dir}/.", deploy_dir cp_r "#{public_dir}/.", deploy_dir
cd "#{deploy_dir}" do cd "#{deploy_dir}" do
system "touch .nojekyll" File.new(".nojekyll", "w").close
system "git add ." system "git add ."
system "git add -u" system "git add -u"
message = "Site updated at #{Time.now.utc}" message = "Site updated at #{Time.now.utc}"