Merge remote branch 'abronte/master'

Conflicts: app/controllers/github_hook_controller.rb
gibson · Jan 1, 2010 · ed43f81 · ed43f81
2 parents 45d66e4 + 511f6bd
commit ed43f81
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/app/controllers/github_hook_controller.rb b/app/controllers/github_hook_controller.rb
@@ -19,7 +19,8 @@ def index
     raise TypeError, "Repository for project '#{identifier}' is not a Git repository" unless repository.is_a?(Repository::Git)
 
     # Get updates from the Github repository
-    command = "cd '#{repository.url}' && cd .. && git pull --rebase"
+    #command = "cd '#{repository.url}' && cd .. && git pull --rebase"
+    command = "cd '#{repository.url}' && git fetch origin && git reset --soft refs/remotes/origin/master"
     exec(command)
 
     # Fetch the new changesets into Redmine