From 7f2f56b2f51269f42f822ecf346375b040267595 Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@ruby-lang.org>
Date: Fri, 24 May 2019 12:22:17 +0900
Subject: [PATCH] Define GITPULLOPTION to rebase [Bug #15871]

---
 common.mk | 2 ++
 1 file changed, 2 insertions(+)

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 =