Contents

require 'straight_line/common/command'
require 'straight_line/common/shell_error'
require 'straight_line/common/git_commands'

module GitCommands
  # Rebase a branch to a base
  class Rebase < Command
    include GitCommands
    def initialize(base, branch)
      super('git')
      arg 'rebase'
      arg base
      arg branch
    end

    def run(*args)
      super true
    rescue ShellError => e
      handle_merge_conflict(e)
    end
  end
end

Version data entries

1 entries across 1 versions & 1 rubygems

Version	Path
straight_line-0.1.1.0	lib/straight_line/common/git_commands/rebase.rb