bit icon indicating copy to clipboard operation
bit copied to clipboard

Feature request: `bit rebase --squash`

Open jyn514 opened this issue 5 years ago • 4 comments
trafficstars

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.

jyn514 avatar Oct 12 '20 06:10 jyn514

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

chriswalz avatar Oct 29 '20 03:10 chriswalz

@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.

jyn514 avatar Oct 29 '20 03:10 jyn514

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.

chriswalz avatar Oct 29 '20 03:10 chriswalz

bit rebase --squash sounds good to me :)

jyn514 avatar Oct 29 '20 03:10 jyn514