diff options
| author | Ivan Kohler <ivan@freeside.biz> | 2016-03-03 18:06:13 -0800 |
|---|---|---|
| committer | Ivan Kohler <ivan@freeside.biz> | 2016-03-03 18:06:13 -0800 |
| commit | 96f83a393859a7cbe95473467250b0c60d53aa4a (patch) | |
| tree | 28e85d8e4f0bc77e0c4af7e94409005d88768cb7 /bin | |
| parent | 899f67d3eb3b5d7815a13235d851e116cb301a6a (diff) | |
fix release script
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/freeside-debian-releases.sh | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/bin/freeside-debian-releases.sh b/bin/freeside-debian-releases.sh index e832d91..03a163a 100644 --- 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 |