commit after stash/revert
Insert stashed thing, try git command, repeat...
Create branch, make minor change