nicalpi

Git - Fixing master if something goes wrong

If you want to get master back into a stable state, say from a tag you know is deployed on production, you can do this:

git checkout master
git reset --hard <tag name>
git push --force origin master

http://stackoverflow.com/questions/6872223/git-revert-master-branch-to-a-tag

nicalpi

asdfasdf

nicalpi

Plugin 'jayferd/eco.vim.git'
Plugin 'mattn/webapi-vim'
Plugin 'mattn/gist-vim'
Plugin 'juvenn/mustache.vim.git'
Plugin 'scrooloose/nerdtree.git'
Plugin 'vim-scripts/ruby-matchit.git'

nicalpi

set nocompatible
command! W :w
filetype off

set rtp+=~/.vim/bundle/Vundle.vim
call vundle#begin()

Plugin 'gmarik/Vundle'

Plugin 'tpope/vim-sensible.git'

nicalpi

Test from Git.vim

nicalpi

jQuery.ajaxSetup({ 
  'beforeSend': function(xhr) {xhr.setRequestHeader("Accept", "text/javascript")}
})

//Send data via get if JS enabled
jQuery.fn.getWithAjax = function() {
  this.click(function() {
    $.get($(this).attr("href"), $(this).serialize(), null, "script");
    return false;

nicalpi

# Logfile created on Wed Mar 11 23:09:05 +0000 2009** acts_as_taggable_on: initialized properly.
  SQL (0.2ms)   SET NAMES 'utf8'
  SQL (0.1ms)   SET SQL_AUTO_IS_NULL=0


Processing NewsfeedsController#index (for 127.0.0.1 at 2009-03-11 23:09:10) [GET]
  Session ID: f23ef4bb335cda6f99d83f9bf734d8a9
  Parameters: {"action"=>"index", "controller"=>"newsfeeds"}
  Tag Load (0.2ms)   SELECT tags.id, tags.name, COUNT(*) AS count FROM `tags` LEFT OUTER JOIN taggings ON tags.id = taggings.tag_id AND taggings.context = 'tags' LEFT OUTER JOIN recipes ON recipes.id = taggings.taggable_id WHERE (taggings.taggable_type = 'Recipe') GROUP BY tags.id, tags.name HAVING COUNT(*) > 0 AND COUNT(*) >= '3' ORDER BY name
  Category Load (0.2ms)   SELECT * FROM `categories` ORDER BY name asc

nicalpi

Processing NewsfeedsController#index (for 86.161.188.78 at 2009-03-11 23:45:03) [GET]
  Session ID: 60c9e4a55e1975607aaf8883f27f3a57
  Parameters: {"action"=>"index", "controller"=>"newsfeeds"}
Rendering template within layouts/app_save
Rendering newsfeeds/index
Completed in 1232ms (View: 1220, DB: 20) | 200 OK [http://www.serialcooking.com/]


Processing NewsfeedsController#index (for 86.161.188.78 at 2009-03-11 23:48:15) [GET]
  Session ID: 60c9e4a55e1975607aaf8883f27f3a57

nicalpi

@recipe = Recipe.find(params[:id],:include => [:user,:comments,:images,:flickrphotos,:newsfeeds,:avatars,:plannings,:favoriting_users,:favorites])

nicalpi

rocessing RecipesController#show (for 127.0.0.1 at 2009-03-12 14:19:55) [GET]
  Session ID: 34efed253de0dc37b0abe6683682c66e
  Parameters: {"action"=>"show", "id"=>"1764", "controller"=>"recipes"}
  ^[[4;35;1mCategory Load (4.8ms)^[[0m   ^[[0mSELECT SQL_NO_CACHE categories.id, categories.name, COUNT(*) AS count FROM `categories` LEFT OUTER JOIN categories_recipes ON categories.id = categories_recipes.category_id GROUP BY categori$
  ^[[4;36;1mCategory Columns (0.6ms)^[[0m   ^[[0;1mSHOW FIELDS FROM `categories`^[[0m
  ^[[4;35;1mRecipe Load (56.3ms)^[[0m   ^[[0mSELECT SQL_NO_CACHE `recipes`.*, t0.category_id as the_parent_record_id FROM `recipes` INNER JOIN `categories_recipes` as t0 ON `recipes`.id = t0.recipe_id WHERE (t0.category_id IN (35,12,5,2$
  ^[[4;36;1mRecipe Columns (1.0ms)^[[0m   ^[[0;1mSHOW FIELDS FROM `recipes`^[[0m
  ^[[4;35;1mUser Columns (0.9ms)^[[0m   ^[[0mSHOW FIELDS FROM `users`^[[0m
  ^[[4;36;1mUser Load (0.2ms)^[[0m   ^[[0;1mSELECT SQL_NO_CACHE * FROM `users` WHERE (`users`.`id` =