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

squash: accept -k as a shorthand for --keep-emptied #4474

Merged
merged 1 commit into from
Sep 15, 2024

Conversation

samueltardieu
Copy link
Contributor

This eases the workflow in which a commit in the middle of the tree is repeatedly squashed into its parent.

The issue came while discussing #4468.

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

This eases the workflow in which a commit in the middle of the tree is
repeatedly squashed into its parent.
@samueltardieu samueltardieu merged commit a7f32d3 into jj-vcs:main Sep 15, 2024
18 checks passed
@samueltardieu samueltardieu deleted the squash-k-shorthand branch September 15, 2024 16:31
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