Define GITPULLOPTION to rebase [Bug #15871]

1 files changed, 2 insertions, 0 deletions

diff --git a/common.mk b/common.mk
index 477a410427..501dc01eff 100755
--- a/common.mk
+++ b/common.mk
@@ -38,6 +38,8 @@ RUBYLIB       = $(PATH_SEPARATOR)
 RUBYOPT       = -
 RUN_OPTS      = --disable-gems
 
+GITPULLOPTIONS = --rebase --autostash
+
 INCFLAGS = -I. -I$(arch_hdrdir) -I$(hdrdir) -I$(srcdir) -I$(UNICODE_HDR_DIR)
 
 GEM_HOME =