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

support rebase merge (conflict free only) #567

Merged
merged 10 commits into from
Mar 11, 2021
Merged

support rebase merge (conflict free only) #567

merged 10 commits into from
Mar 11, 2021

Commits on Mar 4, 2021

  1. support rebse merge (conflict free only)

    Stephan Dilly committed Mar 4, 2021
    Configuration menu
    Copy the full SHA
    38c81c3 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into fix-566-merge-rebase

    Stephan Dilly committed Mar 4, 2021
    Configuration menu
    Copy the full SHA
    55f1e0d View commit details
    Browse the repository at this point in the history

  3. Update merge_commit.rs

    Stephan Dilly authored Mar 4, 2021
    Configuration menu
    Copy the full SHA
    a1746fc View commit details
    Browse the repository at this point in the history

  4. Merge 'fix-566-merge-rebase' of git@github.com:extrawurst/gitui.git

    Stephan Dilly committed Mar 4, 2021
    Configuration menu
    Copy the full SHA
    9278ae0 View commit details
    Browse the repository at this point in the history

Commits on Mar 11, 2021

  1. Merge branch 'master' into fix-566-merge-rebase

    Stephan Dilly committed Mar 11, 2021
    Configuration menu
    Copy the full SHA
    6ae0365 View commit details
    Browse the repository at this point in the history

  2. fix clippy

    Stephan Dilly committed Mar 11, 2021
    Configuration menu
    Copy the full SHA
    e9855cc View commit details
    Browse the repository at this point in the history

  3. cleanup

    Stephan Dilly committed Mar 11, 2021
    Configuration menu
    Copy the full SHA
    ba4efe3 View commit details
    Browse the repository at this point in the history

  4. use config to decide whether to use rebase or merge strategy

    Stephan Dilly committed Mar 11, 2021
    Configuration menu
    Copy the full SHA
    8a305be View commit details
    Browse the repository at this point in the history

  5. changelog

    Stephan Dilly committed Mar 11, 2021
    Configuration menu
    Copy the full SHA
    10ef3d3 View commit details
    Browse the repository at this point in the history

  6. more clear naming

    Stephan Dilly committed Mar 11, 2021
    Configuration menu
    Copy the full SHA
    c0f2895 View commit details
    Browse the repository at this point in the history