From e6eb2a5fd6a27fdb369c84cc1249d477c2b4ba6d Mon Sep 17 00:00:00 2001 From: Sylvestre Mergulhao Date: Mon, 22 Feb 2010 23:52:54 +0800 Subject: [PATCH] we should pull with rebase on git. it prevents git to create an unecessary merge commit. --- tasks/integrate.rake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tasks/integrate.rake b/tasks/integrate.rake index de842e9..ebcbec8 100644 --- 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.'