Guest User

Untitled

a guest
Mar 9th, 2018
405
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 2.69 KB | None | 0 0
  1. > mkdir undo-rebase
  2. ~ > cd !$
  3. cd undo-rebase
  4. ~/undo-rebase > git init
  5. Initialized empty Git repository in .git/
  6. ~/undo-rebase master > touch one
  7. ~/undo-rebase master > ga .
  8. ~/undo-rebase master > gc -m "one"
  9. Created initial commit 3dfffad: one
  10. 0 files changed, 0 insertions(+), 0 deletions(-)
  11. create mode 100644 one
  12. ~/undo-rebase master > touch two
  13. ~/undo-rebase master > ga .
  14. ~/undo-rebase master > gc -m "two"
  15. Created commit 0c36fd9: two
  16. 0 files changed, 0 insertions(+), 0 deletions(-)
  17. create mode 100644 two
  18. ~/undo-rebase master > touch three
  19. ~/undo-rebase master > ga .
  20. ~/undo-rebase master > gc -m "three"
  21. Created commit 6c4a8e8: three
  22. 0 files changed, 0 insertions(+), 0 deletions(-)
  23. create mode 100644 three
  24.  
  25. ~/undo-rebase master > gl
  26. ...
  27. commit 6c4a8e844de2809b23710fe84080187d7c6c89a6
  28. Author: Jack Dempsey <jack.dempsey@gmail.com>
  29. Date: Thu Jul 16 22:40:00 2009 -0400
  30.  
  31. three
  32.  
  33. commit 0c36fd9b1cf3bbc4ad29de5a62e4114465c307b3
  34. Author: Jack Dempsey <jack.dempsey@gmail.com>
  35. Date: Thu Jul 16 22:39:54 2009 -0400
  36.  
  37. two
  38.  
  39. commit 3dfffad2749dea6a187a32f7dd20fa4c13db452b
  40. Author: Jack Dempsey <jack.dempsey@gmail.com>
  41. Date: Thu Jul 16 22:39:46 2009 -0400
  42.  
  43. one
  44.  
  45.  
  46. ~/undo-rebase master > git rebase -i head^^
  47. ...
  48. pick 0c36fd9 two
  49. pick 6c4a8e8 three
  50.  
  51. # Rebase 3dfffad..6c4a8e8 onto 3dfffad
  52. #
  53. # Commands:
  54. # pick = use commit
  55. # edit = use commit, but stop for amending
  56. # squash = use commit, but meld into previous commit
  57. #
  58. # If you remove a line here THAT COMMIT WILL BE LOST.
  59. # However, if you remove everything, the rebase will be aborted.
  60. #
  61.  
  62. ~/undo-rebase master > gl
  63. ...
  64. commit 39521f7ed570f31b778b4281072131e72ada4c82
  65. Author: Jack Dempsey <jack.dempsey@gmail.com>
  66. Date: Thu Jul 16 22:39:54 2009 -0400
  67.  
  68. two
  69.  
  70. commit e0014a06d12f966bf0d332a0e07cbd8c1ecff21c
  71. Author: Jack Dempsey <jack.dempsey@gmail.com>
  72. Date: Thu Jul 16 22:40:00 2009 -0400
  73.  
  74. three
  75.  
  76. commit 3dfffad2749dea6a187a32f7dd20fa4c13db452b
  77. Author: Jack Dempsey <jack.dempsey@gmail.com>
  78. Date: Thu Jul 16 22:39:46 2009 -0400
  79.  
  80. one
  81.  
  82. ~/undo-rebase master > ZOMG wait wait wait
  83.  
  84. ~/undo-rebase master > git reflog show master@{1}
  85.  
  86. 6c4a8e8... master@{1}: commit: three
  87. 0c36fd9... master@{2}: commit: two
  88. 3dfffad... master@{3}: commit (initial): one
  89.  
  90.  
  91. ~/undo-rebase master > git reset 6c4a8e8 --hard
  92. HEAD is now at 6c4a8e8 three
  93.  
  94.  
  95. commit 6c4a8e844de2809b23710fe84080187d7c6c89a6
  96. Author: Jack Dempsey <jack.dempsey@gmail.com>
  97. Date: Thu Jul 16 22:40:00 2009 -0400
  98.  
  99. three
  100.  
  101. commit 0c36fd9b1cf3bbc4ad29de5a62e4114465c307b3
  102. Author: Jack Dempsey <jack.dempsey@gmail.com>
  103. Date: Thu Jul 16 22:39:54 2009 -0400
  104.  
  105. two
  106.  
  107. commit 3dfffad2749dea6a187a32f7dd20fa4c13db452b
  108. Author: Jack Dempsey <jack.dempsey@gmail.com>
  109. Date: Thu Jul 16 22:39:46 2009 -0400
  110.  
  111. one
  112.  
  113. Voila!
Add Comment
Please, Sign In to add comment