From f9ec8978a061fc13dfcf9679de031b8d6e2ed24e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Bar=C4=B1=C5=9F=20Metin?= Date: Thu, 1 Jul 2010 16:18:35 +0200 Subject: [PATCH] use fetch/merge instead of pull as in git-mirror.sh --- module-tools.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/module-tools.py b/module-tools.py index 3db3f881..a6a79610 100755 --- a/module-tools.py +++ b/module-tools.py @@ -291,8 +291,9 @@ class GitRepository: return self.__run_in_repo(c.run_fatal) def update(self, subdir=None, recursive=None): - self.__run_command_in_repo("git fetch --tags") - self.__run_command_in_repo("git pull") + self.__run_command_in_repo("git fetch origin --tags") + self.__run_command_in_repo("git fetch origin") + self.__run_command_in_repo("git merge --ff origin/master") def to_branch(self, branch, remote=True): if remote: -- 2.47.0