Support more interactive rebase commands and external rebase states
As a developer, I would like support for the rest of the interactive rebase commands in order to properly enable cleaning up branch commits when rebasing.
Currently we have 4 of the possible 11 commands for rebasing interactively:
✅ p, pick
✅ r, reword
❓ e, edit
✅ s, squash
❓ f, fixup
❓ x, exec
❓ b, break
✅ d, drop
❓ l, label
❓ t, reset
❓ m, merge
This would be a fantastic feature in general, and there are also unexpected side effects when rebasing externally and Git Kraken is used to commit changes during an edit/fixup/break stage in the rebase.
General improvements for supporting external rebases would help significantly: e.g. the HEAD is set explicitly and the rebase ends resulting in a premature HEAD of the changes and loss of rebase progress.
I would also like to highlight that I would happily accept these changes or additions incrementally, being supported one by one in order to preserve as much stability as possible through GitKraken when Interactive Rebasing.
GitKraken already helps substantially with my day-to-day work in repositories, so this would be that extra layer of polish that would level up the functionality significantly and make my daily workflow so much nicer.
The two things that would help my workflow significantly are:
You can currently emulate fixup with squash, but it's quite annoying because you need to delete the text of the squashed commit from the commit message
Totally agree, edit is needed the most from our end :)
I would love to see "fixup" implemented!
Agreed. I'd love to see at least edit and fixup added.
Please add edit and fixup (in my case - I always need to remove squashed commit message from description for now). But `edit` is probably the most expected option
I'd also love fixup to be added (all of them really, but fixup is the one I miss the most).
I would love to have 'edit' available as an interactive rebase command. I prefer to fix/improve things at the point they are introduced into the branch, and this would remove the need to move the commit around to perform an amend. 🙌
I for one would also love the availability of the 'edit' command. Being able to attribute changes to commits earlier than the last one is quite crucial in correctly structuring PRs.
I'm running into this need more and more, and the command line for that interactive rebase takes quite a lot of time.
It would be awesome to be able to do an interactive rebase in Gitkraken, allowing me to EDIT specific commits as well, and not just pick or reword them as is currently supported
Chris Bowie Admin
"Interactive rebase with edit mode" (suggested by Jim on 2022-11-22), including upvotes (1) and comments (0), was merged into this suggestion.
Jason M. Gates
As you're prioritizing the list of interactive rebase options, I'd tackle fixup first. Using squash and editing the commit message only takes an extra second or two, but integrate that over the number of times I fixup, and it at least adds up to an extra coffee break per week :)
I just migrated from windows / git fork to linux / gitkraken, and I miss the edit option a lot! It’s very useful to split commits before rearranging the history.
And since git kraken refuses to do anything while an external rebase is in progress, I have to go full CLI for this operation, which is very annoying.
It's super sad that I have to use external tool like Fork to interactive reabase with edit option, this one is the most common one!