lib/capistrano/git-submodule-strategy.rb in capistrano-git-submodule-strategy-0.1.2 vs lib/capistrano/git-submodule-strategy.rb in capistrano-git-submodule-strategy-0.1.3

- old
+ new

@@ -24,10 +24,10 @@ # put the working tree in a release-branch, # make sure the submodules are up-to-date # and copy everything to the release path def release git :checkout, fetch(:branch) - git :rebase, "origin/#{fetch(:branch)}", fetch(:branch) + git :reset, '--hard', "origin/#{fetch(:branch)}" git :submodule, :update, '--init', '--recursive' context.execute "rsync -ar --exclude=.git\* #{repo_path}/ #{release_path}" end end end