Rollback/remove commits If we have log like shown below. And we want to remove commit with name <commit_sha1>. git log commit <commit_sha1> ... commit <commit_sha2> ... Then we could execute this lines: git rebase -i HEA D ^^ or git rebase -i <commit_sha2> Rollback file You can quickly review the changes made to a file using the diff command: git difftool <commit_sha> <file_name> -y git diff <commit_sha> <file_name> Then to revert a specific file to that commit use the reset command: git reset <commit_sha> <file_name> Then commit the change: git commit Then checkout latest version for the file: git checkout <file_name> git: undo a merge? After executing this command our master branch will look identical to origin/master: git reset --hard origin/master With git log we can check which commit is one prior the m...