For IntelliJ I use this workflow:
- Open the git log window or
Alt + 9 - Right click on commit you want to split → Interactively Rebase from Here
- Right click on commit you want to split → Stop to edit or
Alt + E - Start Rebasing
- Right click to the current commit in the git log with the yellow label
🏷️!→ Undo commit… alternatively executegit reset HEAD~1in the terminal Ctrl + Kto select and commit your changes with the according message. Repeat as often as necessary until all changes are committed.- On the bottom right click: Rebase Stopped for Editing → Continue