From 4b28c90e3656b55e46755abe7cbd7c0235d7fb72 Mon Sep 17 00:00:00 2001
From: yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 17 Jan 2009 10:40:51 +0000
Subject: * configure.in (VCSUP): fixed the cases for git-svn or git.

* win32/Makefile.sub (VCSUP): ditto.

* Makefile.in (up): `cd' is necessary for git and git-svn.

git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@21630 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 win32/Makefile.sub | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'win32')

diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index ee712835b..a57e79bd4 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -282,10 +282,10 @@ VCS = svn
 VCSUP = $(VCS) up $(SVNUPOPTIONS)
 !else if exist($(srcdir)/.git/svn)
 VCS = git svn
-VCSUP = $(VCS) up $(SVNUPOPTIONS)
+VCSUP = $(VCS) rebase $(GITSVNREBASEOPTIONS)
 !else if exist($(srcdir)/.git)
 VCS = git
-VCSUP = $(VCS) up $(GITUPOPTIONS)
+VCSUP = $(VCS) pull $(GITPULLOPTIONS)
 !endif
 
 all: $(srcdir)/win32/Makefile.sub $(win_srcdir)/Makefile.sub $(srcdir)/common.mk
-- 
cgit