From d7074f82773ac2aeedff3267d4e2bd18758167f7 Mon Sep 17 00:00:00 2001 From: Patrick Uiterwijk Date: Tue, 16 Dec 2014 21:19:39 +0000 Subject: [PATCH] My git-fu eluded me for a second --- roles/dns/files/update-dns | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/dns/files/update-dns b/roles/dns/files/update-dns index 7f617c137f..1719057af9 100755 --- a/roles/dns/files/update-dns +++ b/roles/dns/files/update-dns @@ -10,7 +10,7 @@ fi cd $destdir git fetch origin -if [ "`git diff origin/master master`" != "" ]; +if [ "`git diff origin/master`" != "" ]; then git pull -X theirs # change context so the chroot can cope