GitButler from OP also allows you to do this incredibly easily. This and stacked commits is IMO their main selling point.