GIT DEPLOYMENT SCRIPT

$ pwd
/home/bitrix/www
$ git config --global user.email "koval@francysk.com"
$ git config --global user.name "FRANCYSK DEVELOPER"
$ git config --global --list
user.email=koval@francysk.com
user.name=FRANCYSK DEVELOPER
$ git config core.filemode false
$ whoami
bitrix
$ git status
# On branch master
nothing to commit (working directory clean)
$ git add --all
$ git commit -m "Changes on production"
# On branch master
nothing to commit (working directory clean)
$ git pull origin master
From bitbucket.org:francysk/git.wline.by
* branch master -> FETCH_HEAD
Updating 6a173dd..608e409
Fast-forward
.../frontend/src/scss/catalog/catalog-similar.scss | 25 ++++++++++++++++++
local/frontend/src/scss/header/search-head.scss | 8 ++++++
.../frontend/src/temp/catalog/catalog-similar.html | 27 +++++++++++++++++--
local/frontend/src/temp/header.html | 6 ++++
4 files changed, 63 insertions(+), 3 deletions(-)
$ git checkout --theirs .
$ git commit -am "Update on server"
# On branch master
nothing to commit (working directory clean)
$ git push origin master
Everything up-to-date
$ git submodule sync
$ git submodule update
$ git submodule status
Товар добавлен в корзину Оформить заказ
Товар удален из корзины