Refs: #3527
With interactive rebase we need to be careful, because we want to still be able to properly trigger the opening of our interactive rebase editor.
Identify all the cases and create issues to track each one
### Tasks
- [ ] Add a draft title or issue reference here