From ceac231b768f976dcc650e1410869cec2c0228e4 Mon Sep 17 00:00:00 2001
From: Gea-Suan Lin <darkkiller@gmail.com>
Date: Mon, 15 Mar 2010 14:24:20 +0800
Subject: [PATCH] - Fix pull option.

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 9609183..615fd53 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@ GIT?=		git
 
 #
 pull:
-	${GIT} pull -v
+	${GIT} pull -v --rebase origin master
 
 push:
 	${GIT} push origin master