On Wednesday, 19 April 2017 17:30:58 CEST James E Keenan wrote: > Would the following be the recommend sequence of git commands? > > $ git checkout master > $ git checkout -b start-anew > $ git reset --soft 2.12_002
git reset --soft does not change the working tree. So the change between 2.12_002 and 2.12_004 would not be reverted. I'd suggest instead to do a git revert like: $ git revert -n 2.12_002..master This command will also revert 2.12_002. If this is not desirable, you will have to find the first commit you want to revert and do: $ git revert -n <first-bad-commit>..master Then you can go on with what you suggest below. > $ git commit -m "Rewind to tag 2.12_002" > # hack, hack, hack > $ git add ... > $ git commit -m "Slight touchups to what was 2.12_002" > $ git checkout master > $ git merge start-anew > $ git tag "2.12_005" HTH -- https://github.com/dod38fr/ -o- http://search.cpan.org/~ddumont/ http://ddumont.wordpress.com/ -o- irc: dod at irc.debian.org
