diff options
| author | Francis Dupont <fdupont@isc.org> | 2016-09-28 15:45:25 +0200 |
|---|---|---|
| committer | Francis Dupont <fdupont@isc.org> | 2016-09-28 15:45:25 +0200 |
| commit | fe16ba39e7411a110c0f623b2160d5bad4b816d2 (patch) | |
| tree | 23f8edd11aa79283e9638cdf661464e36c1b75a3 /util | |
| parent | 290a761329bf395e3908b1b85709bbfcdfaf22df (diff) | |
| download | isc-dhcp-fe16ba39e7411a110c0f623b2160d5bad4b816d2.tar.gz | |
Added HEAD to "git merge --ff-only" for old gits
Diffstat (limited to 'util')
| -rw-r--r-- | util/bind.sh | 3 |
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 |