# HG changeset patch
# User Jakob Skjerning <jakob@mentalized.net>
# Date 1262344337 -3600
# Node ID 1549a80bdac5767c8106529981c1d5e3eec41707
# Parent  b2831c838b700e7b352d5c1713ff75db7cbb7838
# Parent  416f4752db74a759e8fe25a9d6376c2417abf326
Merge remote branch 'abronte/master'

Conflicts:
	app/controllers/github_hook_controller.rb

diff -r b2831c838b700e7b352d5c1713ff75db7cbb7838 -r 1549a80bdac5767c8106529981c1d5e3eec41707 app/controllers/github_hook_controller.rb
--- a/app/controllers/github_hook_controller.rb	Fri Jan 01 12:03:54 2010 +0100
+++ b/app/controllers/github_hook_controller.rb	Fri Jan 01 12:12:17 2010 +0100
@@ -19,7 +19,8 @@
     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