gistfile1.txt

aslan@ubuntu:~/workspace/rails_project/sample_app$ git add .
aslan@ubuntu:~/workspace/rails_project/sample_app$ git commit -m "Finish static pages"
[statis-pages f22743e] Finish static pages
 8 files changed, 120 insertions(+), 16 deletions(-)
 create mode 100644 app/views/static_pages/about.html.erb
 rewrite app/views/static_pages/help.html.erb (100%)
 create mode 100644 cracked
 create mode 100644 foobar
 create mode 100644 spec/requests/static_pages_spec.rb
aslan@ubuntu:~/workspace/rails_project/sample_app$ git checkout master
Switched to branch 'master'
aslan@ubuntu:~/workspace/rails_project/sample_app$ git merge stati
static-pages   statis-pages   
aslan@ubuntu:~/workspace/rails_project/sample_app$ git merge static-pages
Updating c18c79e..61a1ed5
Fast-forward
 app/assets/javascripts/static_pages.js.coffee |    3 +++
 app/assets/stylesheets/static_pages.css.scss  |    3 +++
 app/controllers/static_pages_controller.rb    |    7 +++++++
 app/helpers/static_pages_helper.rb            |    2 ++
 app/views/static_pages/help.html.erb          |    2 ++
 app/views/static_pages/home.html.erb          |    2 ++
 config/routes.rb                              |    4 ++++
 db/schema.rb                                  |   16 ++++++++++++++++
 public/hello.html                             |    9 +++++++++
 9 files changed, 48 insertions(+)
 create mode 100644 app/assets/javascripts/static_pages.js.coffee
 create mode 100644 app/assets/stylesheets/static_pages.css.scss
 create mode 100644 app/controllers/static_pages_controller.rb
 create mode 100644 app/helpers/static_pages_helper.rb
 create mode 100644 app/views/static_pages/help.html.erb
 create mode 100644 app/views/static_pages/home.html.erb
 create mode 100644 db/schema.rb
 create mode 100644 public/hello.html
aslan@ubuntu:~/workspace/rails_project/sample_app$ git push
Permission denied (publickey).
fatal: The remote end hung up unexpectedly
aslan@ubuntu:~/workspace/rails_project/sample_app$ keyoku keys:add
keyoku: command not found
aslan@ubuntu:~/workspace/rails_project/sample_app$ heroku keys:add
Found existing public key: /home/aslan/.ssh/id_rsa.pub
Uploading SSH public key /home/aslan/.ssh/id_rsa.pub... done
aslan@ubuntu:~/workspace/rails_project/sample_app$ git push
Permission denied (publickey).
fatal: The remote end hung up unexpectedly
aslan@ubuntu:~/workspace/rails_project/sample_app$