Сантехника, плитка и мебель
$ pwd
/home/bitrix/www
$ git config --global user.email "bitrix@under-style.ru"
$ git config --global user.name "under-style"
$ git config --global --list
user.email=bitrix@under-style.ru
user.name=under-style
$ git config core.filemode false
$ whoami
bitrix
$ git status
# On branch master
nothing to commit, working directory clean
$ git add --all
warning: LF will be replaced by CRLF in .gitconfig.
The file will have its original line endings in your working directory.
$ git commit -m "Changes on production"
# On branch master
nothing to commit, working directory clean
$ git pull origin master
From bitbucket.org:newsite/git-under.by
* branch master -> FETCH_HEAD
Already up-to-date.
$ git checkout --theirs .
$ git commit -am "Remote Conflict"
# 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
$ touch execafterdeploy.php
$ cat execafterdeploy.php
© 2000–2017 Андеграунд Карта сайта
Разработка сайта — Новый сайт