From b128db07581e185721e9afbfd1d104bb5acdbadb Mon Sep 17 00:00:00 2001
From: "Silas S. Brown" <ssb22@hermes.cam.ac.uk>
Date: Tue, 25 Jun 2019 13:34:41 +0100
Subject: [PATCH] Update git-sync script

---
 git-sync.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/git-sync.sh b/git-sync.sh
index 3bd438d..e497f0a 100755
--- a/git-sync.sh
+++ b/git-sync.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-git pull
+git pull --no-edit
 wget -N http://people.ds.cam.ac.uk/ssb22/adjuster/adjuster.py
 wget -N http://people.ds.cam.ac.uk/ssb22/adjuster/annogen.py
 wget -N http://people.ds.cam.ac.uk/ssb22/adjuster/termlayout.py
-- 
GitLab