Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Allow setting merge options in Repository.merge #1008

Merged
merged 2 commits into from
May 19, 2020
Merged

Allow setting merge options in Repository.merge #1008

merged 2 commits into from
May 19, 2020

Commits on May 14, 2020

  1. Allow setting merge options in Repository.merge 

    Up to now, Repository.merge_commits and Repository.merge_trees only
allowed the caller to choose the file_favor. This change also
allows them to set or unset any of the merge_flags or merge_file_flags,
while preserving the default behavior.
    @olsen232
    olsen232 committed May 14, 2020
    Configuration menu
    Copy the full SHA
    ded6a32 View commit details
    Browse the repository at this point in the history

Commits on May 17, 2020

  1. Repository._merge_options tests

    @olsen232
    olsen232 committed May 17, 2020
    Configuration menu
    Copy the full SHA
    44675c1 View commit details
    Browse the repository at this point in the history