• Sean McGivern's avatar
    Change Repository#merge interface for squashing · 28b462c7
    Sean McGivern authored
    When squashing, we may want to merge a different commit than the MR's
    HEAD commit into the target branch. This interface matches the existing
    `Repository#ff_merge` method, and allows us to pick an arbitrary commit
    to merge.
    28b462c7
repository.rb 35.6 KB