diff options
author | Rob Austein <sra@hactrn.net> | 2020-04-18 16:32:39 -0400 |
---|---|---|
committer | Rob Austein <sra@hactrn.net> | 2020-04-18 16:32:39 -0400 |
commit | 31ef459ab6a4ff627850bdda19564b2a566eca15 (patch) | |
tree | 18813ee3f2954b1dd3ee5f39b80c658858fda659 /ssh-sync-repos.py | |
parent | 6e7acd77707c16aa79cec22238ef944682d9184b (diff) |
ff-only
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: |