$ pwd
$ git config --global ""
$ git config --global "FRANCYSK DEVELOPER"
$ git config --global --list DEVELOPER
$ git config core.filemode false
$ whoami
$ git status
# On branch master
# Changed but not updated:
# (use "git add <file>..." to update what will be committed)
# (use "git checkout -- <file>..." to discard changes in working directory)
# modified: headerMetric.php
# modified: local/components/lib/exchange.user/class.php
# Untracked files:
# (use "git add <file>..." to include in what will be committed)
# headerConsult.php
no changes added to commit (use "git add" and/or "git commit -a")
$ git add --all
$ git commit -m "Changes on production"
[master f8e1510] Changes on production
3 files changed, 13 insertions(+), 41 deletions(-)
create mode 100644 headerConsult.php
rewrite headerMetric.php (99%)
$ git pull origin master
* branch master -> FETCH_HEAD
Already up-to-date.
$ git checkout --theirs .
$ git commit -am "Update on server"
# On branch master
nothing to commit (working directory clean)
$ git push origin master
a53c9f1..f8e1510 master -> master
$ git submodule sync
$ git submodule update
$ git submodule status
Товар добавлен в корзину Оформить заказ
Товар удален из корзины