https://git.ruby-lang.org/ruby.git/commit/?id=7f2f56b2f5

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


diff --git a/common.mk b/common.mk
index 477a410..501dc01 100755
--- a/common.mk
+++ b/common.mk
@@ -38,6 +38,8 @@ RUBYLIB       = $(PATH_SEPARATOR) https://github.com/ruby/ruby/blob/trunk/common.mk#L38
 RUBYOPT       = -
 RUN_OPTS      = --disable-gems
 
+GITPULLOPTIONS = --rebase --autostash
+
 INCFLAGS = -I. -I$(arch_hdrdir) -I$(hdrdir) -I$(srcdir) -I$(UNICODE_HDR_DIR)
 
 GEM_HOME =
-- 
cgit v0.10.2


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/