we should pull with rebase on git. it prevents git to create an unece…

…ssary merge commit.
tapajos · May 13, 2010 · e6eb2a5 · e6eb2a5
1 parent c3c1932
commit e6eb2a5
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/tasks/integrate.rake b/tasks/integrate.rake
@@ -167,7 +167,7 @@ namespace :git do
 
   desc 'Update files from repository.'
   task :pull do
-    sh "git pull"
+    sh "git pull --rebase"
   end
 
   desc 'Commit project.'