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

feat(rebase): Rename --skip-empty to --skip-emptied. #4014

Merged
merged 1 commit into from
Jul 4, 2024

Conversation

matts1
Copy link
Contributor

@matts1 matts1 commented Jul 3, 2024

This is based on @martinvonz's comment in #3830 about the inconsistency between squash --keep-emptied and rebase --skip-empty.

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

Copy link
Contributor

@yuja yuja left a comment

Choose a reason for hiding this comment

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

cc @ilyagr

cli/src/commands/rebase.rs Show resolved Hide resolved
cli/src/commands/rebase.rs Outdated Show resolved Hide resolved
This is based on @martinvonz's comment in jj-vcs#3830 about the inconsistency between squash --keep-emptied and rebase --skip-empty.
@matts1 matts1 enabled auto-merge (rebase) July 4, 2024 02:03
@matts1 matts1 merged commit 31ac0d7 into jj-vcs:main Jul 4, 2024
17 checks passed
@matts1 matts1 deleted the skip_empty branch July 4, 2024 04:18
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