Browse Source

Commands only needed prior to release

Bob Mottram 9 years ago
parent
commit
8bf7683861
1 changed files with 2 additions and 0 deletions
  1. 2
    0
      src/freedombone-upgrade

+ 2
- 0
src/freedombone-upgrade View File

65
         rm -rf $PROJECT_DIR/locale/*
65
         rm -rf $PROJECT_DIR/locale/*
66
         git checkout stockholm
66
         git checkout stockholm
67
         # TODO after stockholm merge change this to git_pull
67
         # TODO after stockholm merge change this to git_pull
68
+        git merge --abort
69
+        git stash
68
         git pull $PROJECT_REPO
70
         git pull $PROJECT_REPO
69
         make install
71
         make install
70
         ${PROJECT_NAME} -c $CONFIGURATION_FILE
72
         ${PROJECT_NAME} -c $CONFIGURATION_FILE