diff options
| author | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2020-06-04 10:26:40 +0900 |
|---|---|---|
| committer | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2020-06-04 13:16:24 +0900 |
| commit | 047471c52960e32146025fab064487d25f92a141 (patch) | |
| tree | e970f67bb9b8c838b6f87552b959a4e7a6110e26 /win32/Makefile.sub | |
| parent | 3d7138871079d02b31c05ca6af943d56365a8776 (diff) | |
No GITPULLOPTIONS by default
To honor the environment variable, keep GITPULLOPTIONS unset by
default, and appended the option to VCSUP.
Diffstat (limited to 'win32/Makefile.sub')
| -rw-r--r-- | win32/Makefile.sub | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/win32/Makefile.sub b/win32/Makefile.sub index df9eab2587..df85095ddf 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -499,7 +499,7 @@ HAVE_GIT = no !if defined(VCS) !else if exist($(srcdir)/.git) VCS = $(GIT) -VCSUP = $(VCS) pull $(GITPULLOPTIONS) +VCSUP = $(VCS) pull --rebase $(GITPULLOPTIONS) !else VCSUP = rem !endif |