I’m working with several other developers on a project and we are using git for version control. All of us are git-novices of varying degrees. For some reason one of our devs commits has been overwriting newer work – other devs will commit changes, everything is fine – this dev will commit a change and the new changes will be overwritten with his older version. This is a topic in itself (and any insight is welcome).
My question is: How can I go through the history and remove his commits? Would I use rebase? Cherry pick? As I’ve said, I’m more or less a git novice and I don’t have anyone with more experience to turn to.
You should be able to do this using git filter-branch. Note that this may drastically change your tree, so have multiple backups first and verify the results carefully.