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

Adds support for rebase during update and sync #178

Merged
merged 6 commits into from
Jan 8, 2025
Merged

Adds support for rebase during update and sync #178

merged 6 commits into from
Jan 8, 2025

Conversation

geofflamrock
Copy link
Owner

@geofflamrock geofflamrock commented Jan 8, 2025 •
edited
Loading

This PR is part of a series that add support for using rebase instead of merge

This PR adds support for using rebase instead of merge to the following commands:

  • sync: A new --rebase option
  • update: A new --rebase option
  • push: A new --force-with-lease option

@geofflamrock geofflamrock mentioned this pull request Jan 8, 2025
Merged
@geofflamrock geofflamrock added the minor Increment the minor version when merged label Jan 8, 2025
@geofflamrock geofflamrock merged commit 7caf741 into main Jan 8, 2025
17 checks passed
@geofflamrock geofflamrock deleted the add-rebase-to-update-and-sync branch January 8, 2025 07:16
@gha-automation-personal gha-automation-personal bot mentioned this pull request Jan 6, 2025
Merged
@geofflamrock geofflamrock linked an issue Jan 8, 2025 that may be closed by this pull request
Rebase support? #39
Closed
@geofflamrock geofflamrock mentioned this pull request Jan 8, 2025
Closed
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
minor Increment the minor version when merged
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Rebase support?
1 participant
@geofflamrock