diff options
Diffstat (limited to 'lib/git/lib.rb')
-rw-r--r-- | lib/git/lib.rb | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/git/lib.rb b/lib/git/lib.rb index 2998194..69a31bd 100644 --- a/lib/git/lib.rb +++ b/lib/git/lib.rb @@ -475,6 +475,12 @@ module Git unmerged end + def rebase(branch) + arr_opts = [] + arr_opts << branch + command('rebase', arr_opts) + end + def conflicts #yields :file, :your, :their self.unmerged.each do |f| your = Tempfile.new("YOUR-#{File.basename(f)}").path |