summaryrefslogtreecommitdiff
path: root/util/bind.sh
diff options
context:
space:
mode:
Diffstat (limited to 'util/bind.sh')
-rw-r--r--util/bind.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/util/bind.sh b/util/bind.sh
index 13f6fb36..54f5778a 100644
--- a/util/bind.sh
+++ b/util/bind.sh
@@ -104,7 +104,8 @@ then
cd bind/bind9
test -f Makefile && make distclean
git fetch
- git checkout $BINDTAG && test -n "${noSNAP}" && git merge --ff-only
+ git checkout $BINDTAG && test -n "${noSNAP}" && \
+ git merge --ff-only HEAD
else
# Delete all previous bind stuff
rm -rf bind