git revert --no-commit 2.12_002..
git commit -m "Rewind to tag 2.12_002"
# continue work here