Add git rebase command.

TJ Biddle · TJ Biddle · commit 13374a053653 · 2013-08-05T13:08:29.000-07:00
diff --git a/git.gemspec b/git.gemspec
@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{git}
-  s.version = "1.2.12"
+  s.version = "1.2.13"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Scott Chacon"]
diff --git a/lib/git/base.rb b/lib/git/base.rb
@@ -328,6 +328,10 @@ def merge(branch, message = 'merge', arr = [])
       self.lib.merge(branch, message, arr)
     end
 
+    def rebase(branch)
+      self.lib.rebase(branch)
+    end
+
     # iterates over the files which are unmerged
     def each_conflict(&block) # :yields: file, your_version, their_version
       self.lib.conflicts(&block)
diff --git a/lib/git/branch.rb b/lib/git/branch.rb
@@ -77,6 +77,11 @@ def merge(branch = nil, message = nil)
         @base.merge(@name)
       end
     end
+
+    def rebase(branch)
+      @base.rebase(branch)
+    end
+
     
     def update_ref(commit)
       @base.lib.update_ref(@full, commit)
diff --git a/lib/git/lib.rb b/lib/git/lib.rb
@@ -514,6 +514,10 @@ def merge(branch, message = nil, arr_opts = [])
       command('merge', arr_opts)
     end
 
+    def rebase(branch)
+      command('rebase', [branch])
+    end
+
     def pull(remote = nil, branch = nil)
       opts = []
       opts << remote if remote
diff --git a/ruby-git.gemspec b/ruby-git.gemspec
@@ -1,7 +1,7 @@
 spec = Gem::Specification.new do |s|
     s.platform  =   Gem::Platform::RUBY
     s.name      =   "git"
-    s.version   =   "1.1.1"
+    s.version   =   "1.1.13"
     s.author    =   "Scott Chacon"
     s.email     =   "schacon@gmail.com"
     s.homepage  =   "http://github.com/schacon/ruby-git/tree/master"
