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.

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

Accept options for the rebase command #151

Merged
merged 1 commit into from
Oct 15, 2024

Conversation

keichan34
Copy link
Contributor

Our use case also required -Xtheirs, so I implemented it. Let me know if anything should be updated. I reused utils.getInputAsArray to split arguments and documented the behavior, but if there's a better way to do this let me know so I can fix it. I wanted to do whitespace first, but thinking about interactions between single and double quotes, etc, it just is much easier to delimit by newline.

Closes #114

@peter-evans
Copy link
Owner

Thank you! LGTM 🚀

I wanted to do whitespace first, but thinking about interactions between single and double quotes, etc, it just is much easier to delimit by newline.

I think what you've done is fine. 👍

@peter-evans peter-evans merged commit ebee9ea into peter-evans:main Oct 15, 2024
3 checks passed
@peter-evans
Copy link
Owner

Released as v3.1.0 / v3

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Support for -Xtheirs and other options
2 participants