how to roll back code from person branch for master branch without deleting commit?

1. git pull and git pull origin master to synch

2. git log to see the "old commit point" and "latest commit point"

3. git reset < old commit point> --mixed

4.git checkout -- < modified files>

5. git reset < latest commit point> --mixed

6. git add/ commit/ push.