- While working in a feature branch, assume there are uncommitted changes along with several commits that would need to be squashed.
- Run
gd done
- Don't save the commit (ie in Textmate, cancel the save)
Expected: An interactive rebase so I can squash the commit.
Actual: The rebase is aborted since there are uncommited changes. The commits are then merged into master.
Solution:
Abort the process if there are uncommitted changes. Remove the automatic commit in favor of just a check and then warning. (This might be preferable since the 'commit all' is probably overly greedy anyway.
gd doneExpected: An interactive rebase so I can squash the commit.
Actual: The rebase is aborted since there are uncommited changes. The commits are then merged into master.
Solution:
Abort the process if there are uncommitted changes. Remove the automatic commit in favor of just a check and then warning. (This might be preferable since the 'commit all' is probably overly greedy anyway.