Infrastructure/ansible
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

My git-fu eluded me for a second

Browse source
This commit is contained in:
Patrick Uiterwijk 2014-12-16 21:19:39 +00:00
parent 3886210b35
commit d7074f8277
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
roles/dns/files/update-dns
View file

@ -10,7 +10,7 @@ fi
cd $destdir cd $destdir
git fetch origin git fetch origin
if [ "`git diff origin/master master`" != "" ]; if [ "`git diff origin/master`" != "" ];
then then
git pull -X theirs git pull -X theirs
# change context so the chroot can cope # change context so the chroot can cope