diff options
Diffstat (limited to 'win32/Makefile.sub')
| -rw-r--r-- | win32/Makefile.sub | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/win32/Makefile.sub b/win32/Makefile.sub index ee712835b2..a57e79bd4a 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 |