• Обработка заказов:     Пн-Пт: с 10:00 до 19:00     Сб: с 10:00 до 15:00     Вс: выходной
  • +375 (29) 140-22-00 Заказать звонок
    Заказать звонок

    Ваше сообщение

    Ваш телефон
    Ваш телефон*
    Ваше имя
    Ваше имя

    * - обязательные поля

    Сообщение отправлено
    Ваше сообщение успешно отправлено. В ближайшее время с Вами свяжется наш специалист
    Закрыть окно
  • Отложенные Нет товаров
  • Моя корзина 0 В корзине пусто
$ pwd
/home/forrests/format-sport.by
$ git config --global user.email "git@format-sport.by"
$ git config --global user.name "format-sport-prodaction"
$ git config --global --list
user.email=git@format-sport.by
user.name=format-sport-prodaction
$ git config core.filemode false
$ whoami
forrests
$ git status
# On branch master
# Changes not staged for commit:
# (use "git add <file>..." to update what will be committed)
# (use "git checkout -- <file>..." to discard changes in working directory)
#
# modified: .top.menu.php
# modified: about/contacts/index.php
# modified: about/delivery/index.php
# modified: local/components/dresscode/sale.basket.basket/ajax.php
# modified: local/components/dresscode/sale.basket.basket/component.php
# modified: local/components/dresscode/search.line/templates/.default/ajax.php
# modified: local/templates/dresscodeV2/components/bitrix/catalog.section/squares/result_modifier.php
# modified: local/templates/dresscodeV2/components/dresscode/sale.basket.basket/.default/script.js
# modified: local/templates/dresscodeV2/components/dresscode/sale.basket.basket/.default/style.css
# modified: local/templates/dresscodeV2/components/dresscode/sale.basket.basket/.default/template.php
# modified: local/templates/dresscodeV2/components/dresscode/search/.default/template.php
# modified: local/templates/dresscodeV2/header.php
# modified: local/templates/dresscodeV2/js/jquery.autocomplete.min.js
# modified: ru/.top.menu.php
# modified: ru/about/delivery/index.php
# modified: ru/about/howto/index.php
# modified: ru/about/oplata/index.php
# modified: ru/about/vozvrat/index.php
# modified: ru/catalog/index.php
# modified: ru/prices-info/index.php
# modified: ru/sect_information_block.php
# modified: ru/sect_phone.php
# modified: ru/sect_searchLine.php
# modified: search/index.php
# modified: sect_searchLine.php
#
# Untracked files:
# (use "git add <file>..." to include in what will be committed)
#
# local/templates/.default/components/dresscode/search.line/
no changes added to commit (use "git add" and/or "git commit -a")
$ git add --all
$ git commit -m "Changes on production"
[master 7eb7f32] Changes on production
46 files changed, 2737 insertions(+), 1175 deletions(-)
rewrite about/delivery/index.php (70%)
create mode 100644 local/templates/.default/components/dresscode/search.line/.description.php
create mode 100644 local/templates/.default/components/dresscode/search.line/.parameters.php
create mode 100644 local/templates/.default/components/dresscode/search.line/component.php
create mode 100644 local/templates/.default/components/dresscode/search.line/images/banner.gif
create mode 100644 local/templates/.default/components/dresscode/search.line/images/exit.png
create mode 100644 local/templates/.default/components/dresscode/search.line/lang/ru/.description.php
create mode 100644 local/templates/.default/components/dresscode/search.line/lang/ru/.parameters.php
create mode 100644 local/templates/.default/components/dresscode/search.line/templates/.default/ajax.php
create mode 100644 local/templates/.default/components/dresscode/search.line/templates/.default/images/arrow_s.png
create mode 100644 local/templates/.default/components/dresscode/search.line/templates/.default/images/exit.png
create mode 100644 local/templates/.default/components/dresscode/search.line/templates/.default/images/incart.png
create mode 100644 local/templates/.default/components/dresscode/search.line/templates/.default/images/incartHover.png
create mode 100644 local/templates/.default/components/dresscode/search.line/templates/.default/images/modalSearch.png
create mode 100644 local/templates/.default/components/dresscode/search.line/templates/.default/images/searchGradient1.png
create mode 100644 local/templates/.default/components/dresscode/search.line/templates/.default/images/searchGradient1Hover.png
create mode 100644 local/templates/.default/components/dresscode/search.line/templates/.default/images/searchGradient2.png
create mode 100644 local/templates/.default/components/dresscode/search.line/templates/.default/images/searchGradient2Hover.png
create mode 100644 local/templates/.default/components/dresscode/search.line/templates/.default/lang/ru/template.php
create mode 100644 local/templates/.default/components/dresscode/search.line/templates/.default/script.js
create mode 100644 local/templates/.default/components/dresscode/search.line/templates/.default/style.css
create mode 100644 local/templates/.default/components/dresscode/search.line/templates/.default/template.php
rewrite local/templates/dresscodeV2/js/jquery.autocomplete.min.js (99%)
rewrite ru/about/delivery/index.php (74%)
rewrite ru/about/vozvrat/index.php (69%)
rewrite ru/prices-info/index.php (62%)
rewrite ru/sect_searchLine.php (93%)
$ git pull origin master
From bitbucket.org:Evgeny_Kolonchuk/format-sport.by
* branch master -> FETCH_HEAD
Already up-to-date.
$ git checkout --theirs .
$ git commit -am "Remote Conflict"
# On branch master
# Your branch is ahead of 'origin/master' by 1 commit.
# (use "git push" to publish your local commits)
#
nothing to commit, working directory clean
$ git push origin master
To git@bitbucket.org:Evgeny_Kolonchuk/format-sport.by.git
882f869..7eb7f32 master -> master
$ git submodule sync
$ git submodule update
$ git submodule status
$ touch execafterdeploy.php
$ cat execafterdeploy.php
Товар добавлен в корзину
Итого:
Купить в один клик
Заполните данные для заказа
Запросить стоимость товара
Заполните данные для запроса цены
Запросить цену Запросить цену