$ git remote add upstream https://github.com/codingteam/horta-hell.git
$ git remote set-url origin https://github.com/IngvarJackal/horta-hell
$ git checkout develop 
Switched to branch 'develop'
$ git fetch upstream
remote: Counting objects: 45, done.
remote: Compressing objects: 100% (25/25), done.
remote: Total 45 (delta 10), reused 0 (delta 0)
Unpacking objects: 100% (45/45), done.
From https://github.com/codingteam/horta-hell
 * [new branch]      develop    -> upstream/develop
 * [new branch]      master     -> upstream/master
$ git merge upstream/master
Updating 656b586..622ec6d
Fast-forward
 .../scala/ru/org/codingteam/horta/core/Core.scala  |    4 +-
 .../codingteam/horta/plugins/FortunePlugin.scala   |    2 +-
 .../plugins/htmlreader/HtmlReaderPlugin.scala      |   75 ++++++++++++++++++++
 3 files changed, 79 insertions(+), 2 deletions(-)
 create mode 100644 src/main/scala/ru/org/codingteam/horta/plugins/htmlreader/HtmlReaderPlugin.scala
$ git merge upstream/develop 
Already up-to-date.
$ git push origin master 
Username for 'https://github.com': IngvarJackal
Password for 'https://[email protected]': 
Everything up-to-date
$ git push origin develop 
Username for 'https://github.com': IngvarJackal
Password for 'https://[email protected]': 
To https://github.com/IngvarJackal/horta-hell
   656b586..622ec6d  develop -> develop
$ git stash 
Saved working directory and index state WIP on develop: 622ec6d Attempt to fix #210: use the server-reported encoding.
HEAD is now at 622ec6d Attempt to fix #210: use the server-reported encoding.
$ git branch -D htmlreader 
Deleted branch htmlreader (was 8424a62).
$ git branch htmlreader 
$ git checkout htmlreader 
Switched to branch 'htmlreader'
<тут подредактировал README>
$ git add -A
$ git commit -m "added a few words about $link into README"
[htmlreader d999a07] added a few words about  into README
 1 file changed, 2 insertions(+)
$ git push origin htmlreader 
Username for 'https://github.com': IngvarJackal
Password for 'https://[email protected]': 
To https://github.com/IngvarJackal/horta-hell
 ! [rejected]        htmlreader -> htmlreader (non-fast-forward)
error: failed to push some refs to 'https://github.com/IngvarJackal/horta-hell'
To prevent you from losing history, non-fast-forward updates were rejected
Merge the remote changes (e.g. 'git pull') before pushing again.  See the
'Note about fast-forwards' section of 'git push --help' for details.
$ git push origin --delete htmlreader 
Username for 'https://github.com': IngvarJackal
Password for 'https://[email protected]': 
To https://github.com/IngvarJackal/horta-hell
 - [deleted]         htmlreader
$ git push origin htmlreader 
Username for 'https://github.com': IngvarJackal
Password for 'https://[email protected]': 
To https://github.com/IngvarJackal/horta-hell
 * [new branch]      htmlreader -> htmlreader