diff options
Diffstat (limited to 'ssh-sync-repos.py')
| -rwxr-xr-x | ssh-sync-repos.py | 2 |
1 files changed, 1 insertions, 1 deletions
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: |