-
Notifications
You must be signed in to change notification settings - Fork 344
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(squash): Add --keep-emptied
flag
#3830
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thank you for implementing this! A few drive-by nits.
725779a
to
f0a36cb
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for updating the patch. This looks good to me.
--keep-emptied
flag
f359352
to
2072c5f
Compare
One last thing I'd like to discuss before submitting is what the name of the flag would be. I'll wait for a few days before submitting for any feed back on if people want the name changed. Our options seem to be (feel free to add more if you have any ideas):
|
This is based on @martinvonz's comment in jj-vcs#3830 about the inconsistency between squash --keep-emptied and rebase --skip-empty.
This is based on @martinvonz's comment in jj-vcs#3830 about the inconsistency between squash --keep-emptied and rebase --skip-empty.
This is based on @martinvonz's comment in jj-vcs#3830 about the inconsistency between squash --keep-emptied and rebase --skip-empty.
This is based on @martinvonz's comment in jj-vcs#3830 about the inconsistency between squash --keep-emptied and rebase --skip-empty.
This is based on @martinvonz's comment in jj-vcs#3830 about the inconsistency between squash --keep-emptied and rebase --skip-empty.
This is based on @martinvonz's comment in #3830 about the inconsistency between squash --keep-emptied and rebase --skip-empty.
If the user was thinking in terms of files, instead of commits, then we shouldn't abandon the commit, as that can have side effects such as moving branch pointers.
Fixes #3815
Checklist
If applicable:
CHANGELOG.md