$ git config --global user.email "git_prod@bagi66.ru "
$ git config --global user.name "git_bagi66_prod"
$ git config --global --list
user.email=git_prod@bagi66.ru
user.name=git_bagi66_prod
$ git config core.filemode false
$ git status
# On branch master
# Your branch is ahead of 'origin/master' by 10 commits.
# (use "git push" to publish your local commits)
#
# Changes not staged for commit:
# (use "git add/rm <file>..." to update what will be committed)
# (use "git checkout -- <file>..." to discard changes in working directory)
#
# deleted: sites/bagi66.ru/ajax/error_log_logic.php
# modified: sites/bagi66.ru/form/index.php
#
# Untracked files:
# (use "git add <file>..." to include in what will be committed)
#
# sites/bagi66.ru/ajax/php.ini
# sites/bagi66.ru/form/_index.php.back
no changes added to commit (use "git add" and/or "git commit -a")
$ git add --all
$ git commit -m "Changes on production"
[master a2bc658] Changes on production
4 files changed, 212 insertions(+), 10 deletions(-)
delete mode 100644 sites/bagi66.ru/ajax/error_log_logic.php
create mode 100644 sites/bagi66.ru/ajax/php.ini
create mode 100644 sites/bagi66.ru/form/_index.php.back
$ git pull origin master
remote:
remote: ========================================================================
remote:
remote: ERROR: Your SSH key has expired.
remote:
remote: ========================================================================
remote:
fatal: Could not read from remote repository.
Please make sure you have the correct access rights
and the repository exists.
$ git checkout --theirs .
$ git commit -am "Remote Conflict"
# On branch master
# Your branch is ahead of 'origin/master' by 11 commits.
# (use "git push" to publish your local commits)
#
nothing to commit, working directory clean
$ git push origin master
remote:
remote: ========================================================================
remote:
remote: ERROR: Your SSH key has expired.
remote:
remote: ========================================================================
remote:
fatal: Could not read from remote repository.
Please make sure you have the correct access rights
and the repository exists.
$ git fetch -p
remote:
remote: ========================================================================
remote:
remote: ERROR: Your SSH key has expired.
remote:
remote: ========================================================================
remote:
fatal: Could not read from remote repository.
Please make sure you have the correct access rights
and the repository exists.