code_junkie

Rollback File to much earlier version

Nov 13th, 2011
83
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 0.73 KB | None | 0 0
  1. git diff <commit hash> <filename>
  2.  
  3. git reset <commit hash> <filename>
  4.  
  5. git checkout <commit hash>
  6. git checkout -b <new branch name>
  7.  
  8. git checkout <my branch>
  9. git rebase master
  10. git checkout master
  11. git merge <my branch>
  12.  
  13. $ git checkout $A file
  14.  
  15. $ git revert $B
  16.  
  17. git checkout <my branch>
  18. git rebase master
  19. git checkout master
  20. git merge <my branch>
  21.  
  22. ---o----o----o----o master
  23. ---A----B <my branch>
  24.  
  25. git rebase master <my branch>
  26.  
  27. ---o----o----o----o master
  28. ----A'----B' <my branch>
  29.  
  30. git checkout master
  31. git merge <my branch>
  32.  
  33. ---o----o----o----o----A'----B' master, <my branch>
  34.  
  35. git branch -d <my branch>
  36.  
  37. git revert <hash>
  38.  
  39. git checkout <commit hash> file
  40.  
  41. git commit -a
Add Comment
Please, Sign In to add comment