. ____ . ____________________________
|/ \| | |
[| ♥ ♥ |] | Git Deployment Script v0.1 |
|___==___| / © oodavid 2012 |
|____________________________|

    $ git config --global user.email "git@newsite.by"

$ git config --global user.name "Production Server"

$ echo $PWD
/var/www/maunfeld.ru/shop.maunfeld.ru
$ whoami
ivan
$ git add --all
warning: The behavior of 'git add --all (or -A)' with no path argument from a
subdirectory of the tree will change in Git 2.0 and should not be used anymore.
To add content for the whole tree, run:

  git add --all :/
  (or git add -A :/)

To restrict the command to the current directory, run:

  git add --all .
  (or git add -A .)

With the current Git version, the command is restricted to the current directory.
$ git commit -m "Changes on production"
[master b9f30a9] Changes on production
 4 files changed, 4 insertions(+), 84 deletions(-)
 delete mode 100644 shop.maunfeld.ru/y-market/.section.php
 delete mode 100644 shop.maunfeld.ru/y-market/index.php
$ git pull origin master
From bitbucket.org:newsite/maunfeld.ru
 * branch            master     -> FETCH_HEAD
Already up-to-date.
$ git checkout --theirs .

$ git commit -am "Remote Conflict"
[master f3198f8] Remote Conflict
 1 file changed, 3 insertions(+), 1 deletion(-)
$ git push origin master
To git@bitbucket.org:newsite/maunfeld.ru.git
   af4fd96..f3198f8  master -> master
$ git submodule sync

$ git submodule update

$ git submodule status