aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xhttps-sync-repos.py2
-rwxr-xr-xssh-sync-repos.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/https-sync-repos.py b/https-sync-repos.py
index 13766e3..acd8694 100755
--- a/https-sync-repos.py
+++ b/https-sync-repos.py
@@ -28,7 +28,7 @@ for elt in ElementTree(file = urlopen(trac_page)).iter("{http://www.w3.org/1999/
try:
if pull:
check_call(("git", "fetch", "--all", "--prune"), cwd = repo)
- check_call(("git", "merge"), cwd = repo)
+ check_call(("git", "merge", "--ff-only"), cwd = repo)
else:
check_call(("git", "clone", url, repo))
except:
diff --git a/ssh-sync-repos.py b/ssh-sync-repos.py
index 2cedac3..756686d 100755
--- a/ssh-sync-repos.py
+++ b/ssh-sync-repos.py
@@ -21,7 +21,7 @@ for repo in sorted(info["repos"]):
pull = isdir(repo)
if pull:
check_call(("git", "fetch", "--all", "--prune"), cwd = repo)
- check_call(("git", "merge"), cwd = repo)
+ check_call(("git", "merge", "--ff-only"), cwd = repo)
else:
check_call(("git", "clone", "{}:{}.git".format(user, repo), repo))
except: