git revert --no-commit 2.12_002..
git commit -m "Rewind to tag 2.12_002"
# continue work here
####
git checkout -b start-anew 2.12_002
# - make edits here -
git checkout master
git merge -s recursive -X theirs \
-m 'Merge branch "start-anew" (based on 2.12_002)' \
start-anew
git branch -d start-anew
git log --oneline --decorate --graph
##
##
git init
echo -e "Hello, World\n---" >foo.txt
git add foo.txt
git commit -m 'Initial commit'
for VER in 001 002 003 004
do
VER="2.12_$VER"
echo -e "Added in $VER\n---" >>foo.txt
git commit -am "Edit for $VER"
git tag $VER
done
##
##
echo -e "Added in 2.12_005\n---" >>foo.txt
git commit -am "Edit for 2.12_005"