Class: Eternity::Patch::Merge
- Inherits:
-
Object
- Object
- Eternity::Patch::Merge
- Includes:
- Common
- Defined in:
- lib/eternity/patch.rb
Instance Attribute Summary
Attributes included from Common
#current_commit, #target_commit
Instance Method Summary collapse
Methods included from Common
#base_commit, #base_history, #current_history, #delta, #initialize, #remaining_history, #target_history
Instance Method Details
#merged? ⇒ Boolean
82 83 84 85 86 |
# File 'lib/eternity/patch.rb', line 82 def merged? @merged ||= current_commit == target_commit || target_commit.fast_forward?(current_commit) || current_commit.fast_forward?(target_commit) end |