Ruby

goto /users/tim/code/ruby

rails new appname

sets up directory system

bundle install

installs gems

.gitignore

installed with rails new

git init

starts new repository

git add .

git status; tells you what branch you are on and if you have stuff to commit

git commit

commits change locally

git log

of commits

on github

new repository

back on local machine

git remote add origin git@github.com

mckennatim/rubyapp2.git: this line is given in github

git push -u origin master

get checkout -b modify-README

creates a new branch

mate README

now in new branch

git mv README README.markdown

mate README.markdown

git commit -am "improve readme"

commit locally all, message

git checkout master

moves back to master branch

git merge modify-README

bringes changes of the modify-README branch into the master branch

git push

all you need to push it back to github

to use hosting site

heroku

heroku keys:add

heroku create

git push heroku master

git mergetool

to resolve conflicts