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

Conversation

extrawurst
Copy link
Owner

@extrawurst extrawurst commented Mar 4, 2021 •
edited
Loading

closes #566

  • do merge commit by default
  • check if git settings is set to rebase on merge and use it

@extrawurst extrawurst changed the title support rebse merge (conflict free only) support rebase merge (conflict free only) Mar 4, 2021
@extrawurst extrawurst marked this pull request as ready for review March 11, 2021 10:36
@extrawurst extrawurst merged commit bfa2401 into master Mar 11, 2021
@extrawurst extrawurst deleted the fix-566-merge-rebase branch March 11, 2021 10:49
extrawurst pushed a commit that referenced this pull request May 27, 2021
support rebase merge (conflict free only) (#567)
79a3f98
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

support simple (conflict free) rebase merge
1 participant
@extrawurst