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

rebase: allow -r to accept multiple revisions #3564

Merged
merged 1 commit into from
Apr 26, 2024

Conversation

bnjmnt4n
Copy link
Collaborator

@bnjmnt4n bnjmnt4n commented Apr 23, 2024

Closes #1158.

Checklist

If applicable:

  • I have updated CHANGELOG.md
  • I have updated the documentation (README.md, docs/, demos/)
  • I have updated the config schema (cli/src/config-schema.json)
  • I have added tests to cover my changes

@martinvonz
Copy link
Owner

martinvonz commented Apr 24, 2024

How much will this conflict with #3396 (--insert-before/-after)? I'd rather see this PR merged first, both because I think it's more useful, and because it seems important to keep it in mind when designing --insert-before/-after. Do you agree?

EDIT: "because it seems important to keep it in mind when designing" can of course apply in the other direction too, but I think it seems like a bigger risk that --insert-before/-after with single-commit -r would be implemented in a way that's hard to adapt to multi-commit -r than the other way around

@bnjmnt4n
Copy link
Collaborator Author

Agreed, I would rather this PR get merged first. It’s functionally ready, but I probably need to do some minor code cleanup as well.

@bnjmnt4n bnjmnt4n marked this pull request as ready for review April 24, 2024 07:19
@bnjmnt4n bnjmnt4n marked this pull request as draft April 24, 2024 14:22
@bnjmnt4n bnjmnt4n force-pushed the bnjmnt4n/push-smstnuvssunm branch 2 times, most recently from 940ac95 to a34b7e0 Compare April 24, 2024 14:42
@bnjmnt4n bnjmnt4n marked this pull request as ready for review April 24, 2024 14:54
cli/src/commands/rebase.rs Outdated Show resolved Hide resolved
cli/src/commands/rebase.rs Show resolved Hide resolved
cli/src/commands/rebase.rs Outdated Show resolved Hide resolved
cli/src/commands/rebase.rs Show resolved Hide resolved
cli/tests/test_rebase_command.rs Outdated Show resolved Hide resolved
cli/src/commands/rebase.rs Show resolved Hide resolved
@bnjmnt4n bnjmnt4n force-pushed the bnjmnt4n/push-smstnuvssunm branch 4 times, most recently from 7119397 to 679ce3f Compare April 25, 2024 21:23
cli/src/commands/rebase.rs Outdated Show resolved Hide resolved
cli/src/commands/rebase.rs Outdated Show resolved Hide resolved
cli/src/commands/rebase.rs Outdated Show resolved Hide resolved
cli/src/commands/rebase.rs Outdated Show resolved Hide resolved
cli/tests/test_rebase_command.rs Show resolved Hide resolved
cli/src/commands/rebase.rs Outdated Show resolved Hide resolved
cli/src/commands/rebase.rs Outdated Show resolved Hide resolved
cli/src/commands/rebase.rs Outdated Show resolved Hide resolved
cli/src/commands/rebase.rs Outdated Show resolved Hide resolved
cli/src/commands/rebase.rs Outdated Show resolved Hide resolved
cli/src/commands/rebase.rs Show resolved Hide resolved
cli/src/commands/rebase.rs Outdated Show resolved Hide resolved
@bnjmnt4n bnjmnt4n force-pushed the bnjmnt4n/push-smstnuvssunm branch 4 times, most recently from 837a5b9 to 5389acf Compare April 26, 2024 13:53
Copy link
Owner

@martinvonz martinvonz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you!

@bnjmnt4n bnjmnt4n merged commit 6752402 into main Apr 26, 2024
16 checks passed
@bnjmnt4n bnjmnt4n deleted the bnjmnt4n/push-smstnuvssunm branch April 26, 2024 15:51
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.

jj rebase should accept multiple revisions for -r (-s, and -b are done)
3 participants