When I want to temporarily move my changes to a safe place—until I finish a Git operation—I use git stash.

Example:

git stash push -m "WIP layout change"

To revert last stash execute:

git stash pop