Yeah. Consider I have a feature branch that no-one depends on. When my history is messed up I do easy rebase : git reset --soft master (or whatever commit u

Yeah. Consider I have a feature branch that no-one depends on. When my history is messed up I do easy rebase : git reset --soft master (or whatever commit up to which I want to UNDO, but no further than commit I branched off from) Now at this point changes from multiple commits are in my STAGING. git commit -m "Feature X implemented" git push --force (you can do If no-one depends on your branch, otherwise - don't do this)