# HG changeset patch
# User Jakob Skjerning <jakob@mentalized.net>
# Date 1249991622 -7200
# Node ID 24a7489da3960ef43454ee43765cc1b855bb0ca0
# Parent  fc9019211859bb7fbdc476abbee77ba09c8baad1
Use rebase to bring in changes from the remote repository to avoid merge-commit-messages in your Redmine changesets

diff -r fc9019211859bb7fbdc476abbee77ba09c8baad1 -r 24a7489da3960ef43454ee43765cc1b855bb0ca0 app/controllers/github_hook_controller.rb
--- a/app/controllers/github_hook_controller.rb	Mon Aug 03 15:57:44 2009 +0200
+++ b/app/controllers/github_hook_controller.rb	Tue Aug 11 13:53:42 2009 +0200
@@ -17,7 +17,7 @@
     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"
+    command = "cd '#{repository.url}' && cd .. && git pull --rebase"
     exec(command)
 
     # Fetch the new changesets into Redmine