Commit 5f657df070533677a77e75e053c8e6c1b65ec97b

Merge branch 'master' of ../mainline

Conflicts:

lib/git-rails/commands/init.rb

Commit diff

History.txt

 
1=== 0.3.0 / 2008-02-06
2
3* enhancements:
4 * split up ignores - Ron Damen
5
6 i prefer the ignore to be in separate files.
7 added ignore for sqlite databases.
8
9 * typo fixed in init - Ron Damen
10
111=== 0.2.0 / 2008-02-04
212
313* enhancements:
toggle raw diff

README.txt

 
1= git-rails
1= git-rails:
22
33* http://blog.nanorails.com/git-rails
4* http://rubyforge.org/projects/git-rails/
45
56== DESCRIPTION:
67
2626* hoe 1.5.0
2727* main 2.8.0
2828* rake 0.8.1
29* rspec 1.1.3
2930
3031== INSTALL:
3132
toggle raw diff

Rakefile

 
88 p.rubyforge_name = 'git-rails'
99 p.author = 'Pascal Belloncle (nano RAILS)'
1010 p.email = 'psq@nanorails.com'
11 p.summary = 'Tools to make using git with rails a breeze'
12 p.description = p.paragraphs_of('README.txt', 2..5).join("\n\n")
13 p.url = p.paragraphs_of('README.txt', 0).first.split(/\n/)[1..-1]
14 p.changes = p.paragraphs_of('History.txt', 0..1).join("\n\n")
1511 p.extra_deps << ['main', '>= 2.8.0']
1612end
1713
toggle raw diff

lib/git-rails/version.rb

 
11module GitRails #:nodoc:
22 module VERSION #:nodoc:
33 MAJOR = 0
4 MINOR = 2
5 TINY = 1
4 MINOR = 3
5 TINY = 0
66
77 STRING = [MAJOR, MINOR, TINY].join('.')
88 end
toggle raw diff