bard 0.5.4 → 0.5.5

data/VERSION

@@ -1 +1 @@
-0.5.4
+0.5.5

data/bard.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bard}
-  s.version = "0.5.4"
+  s.version = "0.5.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Micah Geisel", "Nick Hogle"]

data/lib/bard.rb

@@ -17,7 +17,7 @@ class Bard < Thor
 
     required = {
       'bard'     => `gem list bard --remote`[/[0-9]+\.[0-9]+\.[0-9]+/],
-      'git'      => '1.6.0',
+      'git'      => '1.6.4',
       'rubygems' => '1.3.4',
       'ruby'     => '1.8.6'
     }
@@ -59,7 +59,7 @@ class Bard < Thor
       run_crucial "git submodule sync"
       run_crucial "git submodule init"
     end
-    run_crucial "git submodule update --merge"
+    run_crucial "git submodule update --rebase"
    
     if changed_files.any? { |f| f =~ %r(^config/environment.+) }
       run_crucial "rake gems:install"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bard
 version: !ruby/object:Gem::Version 
-  version: 0.5.4
+  version: 0.5.5
 platform: ruby
 authors: 
 - Micah Geisel