Support `autosquash` with `fixup!` commits
As a developer, I would like to easily squash commits prefixed by `fixup!`, in order to quickly rebase branches without reordering fixups manually.
This feature is natively supported by `git` with the `--autosquash` option and by `git-cola`.
Current steps to achieve the same goal today:
1. reorder the commits by hand;
1. select `squash` in the commit fix;
1. edit the comment of the main commit to remove the duplicate messages.
Those operations might be very tedious, time consuming and error prone especially when there are a many commits to fix and/or many fixups. Above all when you have to cancel the rebase for some reasons and start again.
With the `autosquash` feature, the same need could easily and quickly be done. It would just require to prefix the commit with the `fixup!` magic comment and let the tool automatically achieve the 3 steps above: reorder, select the `squash` mode and remove the duplicate messages.
Comments: 9
-
26 Jun, '21
Julien Stébenne MergedWhen cleaning up branches to remove extra commits in order to keep it short and simple, doing a fixup is necessary.
Right now, if we want to do this, we need to do a squash then do another interactive rebase and reword. -
28 Jun, '21
Giacomo Zanotti Admin"Add fixup option during interactive rebase" (suggested by Julien Stébenne on 2021-06-26), including upvotes (1) and comments (0), was merged into this suggestion.
-
20 Jul, '21
TimHave a look at the tower client when implementing this feature. They have done it in a very good way
-
04 Aug, '21
Carl DunhamThe interactive rebase feature seems to be neglected, along with other core git functionality, with attention given to Issues, Teams, and other things that have less to do with why we paid for this tool.
2 -
30 Sep, '21
TimPlease reconsider this feature since this is a git feature which is really useful.
Features like Teams, git cli and issues are nice for some people but mainly we want a really good git client which supports the core git features (my opinion) -
01 May, '22
mehdiup,
Hi team,
i hope to write the comment who trigger the implement of this quick win. :)
It will be verry useful for dev teams to have a fixup feature.
or the option to don't complete the description with the squashed commit.
Today i need to do it with the command line to don't take the commit assignement.
So i need to used another tools to respect my team practices.
Have a nice day! -
11 Jul, '22
Peteragrees, having the option to select fixup instead of squash in the drop down box would be very useful
-
01 Sep, '22
Jason M. GatesJust throwing in my two cents: We recently had to move away from JetBrains products, and the best alternative we could find was VS Code + GitKraken, but the lack of fixup in the interactive rebase is severely disappointing. My workflow is one in which I'm regularly (dozens of times a day) moving commits all over the place, and the squash + reword tedium is very frustrating. I'm tempted to just go back to git in the terminal.
1 -
04 Mar
Jan KatinsNow that gitkrakne uses git cli directly, it seems the implementation is "just" a new dropdown element and writing that as "fixup" to the respective rebase file...