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

feat: Add merge-method option #105

Merged
merged 3 commits into from
Aug 12, 2021
Merged

feat: Add merge-method option #105

merged 3 commits into from
Aug 12, 2021

Commits on Aug 7, 2021

  1. feat: Add merge-method option

    @simenandre
    simenandre committed Aug 7, 2021
    Configuration menu
    Copy the full SHA
    c7e05e2 View commit details
    Browse the repository at this point in the history

  2. add changelog

    @simenandre
    simenandre committed Aug 7, 2021
    Configuration menu
    Copy the full SHA
    ea92707 View commit details
    Browse the repository at this point in the history

Commits on Aug 12, 2021

  1. cmd/merge: add validation to --merge-method

    @nathanleiby
    nathanleiby committed Aug 12, 2021
    Configuration menu
    Copy the full SHA
    2c7c847 View commit details
    Browse the repository at this point in the history