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

cli rebase: Allow jj rebase -r to rebase a commit onto a descendant #2461

Merged
merged 1 commit into from
Oct 30, 2023

Conversation

ilyagr
Copy link
Contributor

@ilyagr ilyagr commented Oct 29, 2023

#1188

There are some additional test changes because children and descendants are now rebased before the commit itself.

Checklist

If applicable:

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

@ilyagr ilyagr force-pushed the rebase-to-desc branch 3 times, most recently from 0557ad4 to 7453b43 Compare October 29, 2023 03:22
@ilyagr ilyagr marked this pull request as ready for review October 29, 2023 03:25
@ilyagr ilyagr force-pushed the rebase-to-desc branch 12 times, most recently from eeaa57e to b78524d Compare October 30, 2023 04:16
cli/src/commands/rebase.rs Outdated Show resolved Hide resolved
jj-vcs#1188

There are some additional test changes because children and descendants are now
rebased before the commit itself.
@ilyagr ilyagr enabled auto-merge (rebase) October 30, 2023 17:43
@ilyagr ilyagr merged commit 8bc3f5f into jj-vcs:main Oct 30, 2023
14 checks passed
@ilyagr ilyagr deleted the rebase-to-desc branch October 30, 2023 18:01
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.

2 participants