I think git is being used now (huge improvement from the original CVS
).
There are two ways to remove a commit from a branch.
1. If you have not pushed back to origin yet, you can eliminate it from the commit history all together with:
eg. Remove the last commit
git reset --hard HEAD~1
eg. Remove the last two commits
git reset --hard HEAD~2
eg. Remove all commits after commit with sha1 abc123
git reset --hard abc123
(Be warned, you may lose track of the commits you made so make a note of their sha1 so you can cherry-pick them or merge with them later. A reset hard will remove it from the tree but it will still be in the repo)
2. If you have pushed back to origin, best not to do the above since a reset combined with a force push can cause the branch to diverge for other devs, so instead you can make a revert commit with:
eg Revert commit with sha1 abc123
git revert abc123
Hope that helps.