summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorIvan Kohler <ivan@freeside.biz>2016-03-03 18:06:11 -0800
committerIvan Kohler <ivan@freeside.biz>2016-03-03 18:06:11 -0800
commit0769dd2b2f407d4b4b7f2864eb8690cd631c345b (patch)
tree0f570e7f58169a8316e1ab8c359c48897fd75fc5 /bin
parent25e5b21adf718408a64bf4596b644c6901e5da1e (diff)
fix release script
Diffstat (limited to 'bin')
-rwxr-xr-xbin/freeside-debian-releases.sh4
1 files changed, 3 insertions, 1 deletions
diff --git a/bin/freeside-debian-releases.sh b/bin/freeside-debian-releases.sh
index e832d9176..03a163a79 100755
--- a/bin/freeside-debian-releases.sh
+++ b/bin/freeside-debian-releases.sh
@@ -27,7 +27,9 @@ rm -fr $DIR/freeside/debian/freeside-ng-selfservice.conffiles
# Pull any changes
cd $DIR/freeside
-STATUS=`git pull`
+git checkout -- debian/changelog
+git pull
+#STATUS=`git pull`
#Assign the proper config files for freeside-ng-selfservice
if [ $DISTRO = "wheezy" ]; then