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

Feature request: bit rebase --squash #26

Open
jyn514 opened this issue Oct 12, 2020 · 4 comments
Open

Feature request: bit rebase --squash #26

jyn514 opened this issue Oct 12, 2020 · 4 comments
Labels
enhancement New feature or request
Milestone

Comments

@jyn514
Copy link

jyn514 commented Oct 12, 2020

Like git rebase -i, but the prompt it opens up has all but the first commit set to squash instead of pick by default. Maybe it could have both an interactive and non-interactive mode? By 'interactive' I just mean 'opens the rebase prompt in your editor', like git.

@chriswalz chriswalz added the enhancement New feature or request label Oct 12, 2020
@chriswalz chriswalz added this to the v0.9.5 milestone Oct 28, 2020
@chriswalz
Copy link
Owner

chriswalz commented Oct 29, 2020

@jyn514 There's git merge --squash that I believe effectively does the same thing

@jyn514
Copy link
Author

jyn514 commented Oct 29, 2020

@chriswalz that's not quite the same thing - git merge --squash branch takes the changes from branch and applies them to the index without committing. But that's not at all the same as rebasing, which puts your current state on top of the changes from branch, keeping the history. Or in other words, merge --squash squashes the changes from branch, but rebase -i squashes the changes in your current branch.

@chriswalz
Copy link
Owner

Ah so it's a matter of merge vs. rebasing. It's strange how git provides one but not the other but I guess that's what bit is for 😛.

Some potential commands could be bit rebase --squash, bit rebase -i --squash or simply bit squash as requested.

@jyn514
Copy link
Author

jyn514 commented Oct 29, 2020

bit rebase --squash sounds good to me :)

@chriswalz chriswalz changed the title Feature request: bit squash Feature request: bit rebase --squash Oct 29, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

No branches or pull requests

2 participants