Posts Tagged ‘Git’

|

Deploying with Git and Capistrano

Get your git all setup and your project gitified.

Freeze your gems and freeze to edge your project and git push that to the server (rake rails:freeze:gems and rake rails:freeze:edge or rake rails:freeze:edge TAG=rel_2-0-2 see here ) (script/about to see what version your rails is already on. maybe you already froze earlier and forgot)

Capify your project (capify .)

Edit deploy.rb file created by capistrano use this instructions also use hostingrails? wiki for capistrano two Here?s an example of deploy.rb

Edit Capfile created by capistrano example code

Set ENV[?RAILS_ENV?] ||= ?production? in config/environment.rb

Edit .htaccess file to do fcgi instead of normal cgi instructions here

On local machine run cap -T to view commands available

Add an ssh-keygen to the server as well (since it will be taking from github) see here and here

Follow the latter end of these instructions from hostingrails

2 Responses | April 12, 2008

Git command list

Here’s a helpful wiki

  • git init
  • git status
  • touch .gitignore
  • git add .
  • git commit -a
  • git add
  • git branch <? to check available branches
  • git branch [new_branch_name] <? to create a new branch
  • git co [branch]
  • git remote add origin git@github.com:scottmotte/lilruby.git
  • git push origin master
  • git clone
  • git push
  • git pull
  • get pull origin [branch name]
  • git fetch / git merge <? basically git pull combined
  • git diff master human <? see the human changes that will be added to master
  • git diff master human | mate <? pipes it to text editor
  • git branch -d [branch name] <? deletes a branch

For merging

  1. git co master <?go into the branch you want to merge into
  2. (use the other branch to pull the changes you made on that other branch into master)
  3. git merge human <? then just do git merge [branch name]

For rebasing 1. git co master <? go into the branch you want to rebase into 2. (use the other branch to pull the changes you made on that other branch (your name e.g. ryan or scott into master) 3. git rebase scott <? then just do git rebase [branch name]

For pulling Pulling is also a merge so make sure you are on the master when you are pulling something in.

For conflicts git diff

.gitignore file

These are some of the things I usually like to ignore:

  • .DS_Store
  • index/*
  • public/attachments/*
  • log/*.log

deleting a branch on github Stop tracking a remote branch git branch -d -r origin/< remote branch name >

from here: link

No Comments | April 1, 2008

|