Advertisement
Guest User

Untitled

a guest
Mar 16th, 2016
257
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 3.92 KB | None | 0 0
  1. desktop ~/tmp/gitplay
  2. [✓]▶ git init
  3. Initialized empty Git repository in /Users/dylan.cali/tmp/gitplay/.git/
  4.  
  5. desktop (master #) ~/tmp/gitplay
  6. [✓]▶ echo ohhai > foo
  7.  
  8. desktop (master #?) ~/tmp/gitplay
  9. [✓]▶ git add foo
  10.  
  11. desktop (master #) ~/tmp/gitplay
  12. [✓]▶ git commit -m 'add foo'
  13. [master (root-commit) 7b57f08] add foo
  14. 1 file changed, 1 insertion(+)
  15. create mode 100644 foo
  16.  
  17. desktop (master) ~/tmp/gitplay
  18. [✓]▶ echo ohhai >> foo
  19.  
  20. desktop (master -) ~/tmp/gitplay
  21. [✓]▶ git commit -am 'add another ohhai line'
  22. [master 34463e4] add another ohhai line
  23. 1 file changed, 1 insertion(+)
  24.  
  25. desktop (master) ~/tmp/gitplay
  26. [✓]▶ echo ohhai >> foo
  27.  
  28. desktop (master -) ~/tmp/gitplay
  29. [✓]▶ git commit -am 'and yet another ohhai line'
  30. [master 52945df] and yet another ohhai line
  31. 1 file changed, 1 insertion(+)
  32.  
  33. desktop (master) ~/tmp/gitplay
  34. [✓]▶ echo ohbye >> foo
  35.  
  36. desktop (master -) ~/tmp/gitplay
  37. [✓]▶ git commit -am 'add ohbye'
  38. [master 76f0ec6] add ohbye
  39. 1 file changed, 1 insertion(+)
  40.  
  41. desktop (master) ~/tmp/gitplay
  42. [✓]▶ git log
  43. commit 76f0ec61c20df0cab4ac6298257a29b9943073b8
  44. Author: Dylan Cali <calid1984@gmail.com>
  45. Date: Wed Mar 16 15:49:35 2016 -0400
  46.  
  47. add ohbye
  48.  
  49. commit 52945df35a24cc93d95caf41484a44bca468267a
  50. Author: Dylan Cali <calid1984@gmail.com>
  51. Date: Wed Mar 16 15:48:28 2016 -0400
  52.  
  53. and yet another ohhai line
  54.  
  55. commit 34463e4138276c5063ba6e5ac2eaac50755097c3
  56. Author: Dylan Cali <calid1984@gmail.com>
  57. Date: Wed Mar 16 15:48:12 2016 -0400
  58.  
  59. add another ohhai line
  60.  
  61. commit 7b57f083c77cc3ecb71be6325d9d1c3c95697837
  62. Author: Dylan Cali <calid1984@gmail.com>
  63. Date: Wed Mar 16 15:47:57 2016 -0400
  64.  
  65. add foo
  66.  
  67. desktop (master) ~/tmp/gitplay
  68. [✓]⚑ git rebase -i HEAD~3
  69.  
  70. pick 34463e4 add another ohhai line
  71. s 52945df and yet another ohhai line
  72. pick 76f0ec6 add ohbye
  73.  
  74. # Rebase 7b57f08..76f0ec6 onto 7b57f08 (3 command(s))
  75. #
  76. # Commands:
  77. # p, pick = use commit
  78. # r, reword = use commit, but edit the commit message
  79. # e, edit = use commit, but stop for amending
  80. # s, squash = use commit, but meld into previous commit
  81. # f, fixup = like "squash", but discard this commit's log message
  82. # x, exec = run command (the rest of the line) using shell
  83. # d, drop = remove commit
  84. #
  85. # These lines can be re-ordered; they are executed from top to bottom.
  86. #
  87. # If you remove a line here THAT COMMIT WILL BE LOST.
  88. #
  89. # However, if you remove everything, the rebase will be aborted.
  90. #
  91. # Note that empty commits are commented out
  92.  
  93. --> SAVE QUIT, BRINGS UP COMMIT DIALOG:
  94.  
  95. # This is a combination of 2 commits.
  96. # The first commit's message is:
  97.  
  98. add another ohhai line
  99.  
  100. # This is the 2nd commit message:
  101.  
  102. and yet another ohhai line
  103.  
  104. # Please enter the commit message for your changes. Lines starting
  105. # with '#' will be ignored, and an empty message aborts the commit.
  106. #
  107. # Date: Wed Mar 16 15:48:12 2016 -0400
  108. #
  109. # interactive rebase in progress; onto 7b57f08
  110. # Last commands done (2 commands done):
  111. # pick 34463e4 add another ohhai line
  112. # s 52945df and yet another ohhai line
  113. # Next command to do (1 remaining command):
  114. # pick 76f0ec6 add ohbye
  115. # You are currently editing a commit while rebasing branch 'master' on '7b57f08'.
  116. #
  117. # Changes to be committed:
  118. # modified: foo
  119. #
  120.  
  121. --> CHANGE COMMIT MESSAGE TO 'add some ohhai lines' AND SAVE
  122.  
  123. desktop (master) ~/tmp/gitplay
  124. [✓]⚑ git rebase -i HEAD~3
  125. [detached HEAD 4191b91] add some ohhai lines
  126. Date: Wed Mar 16 15:48:12 2016 -0400
  127. 1 file changed, 2 insertions(+)
  128. Successfully rebased and updated refs/heads/master.
  129.  
  130. desktop (master) ~/tmp/gitplay
  131. [✓]▶ git log
  132. commit 89f283310faed0e26f5d89f6096b643192882cab
  133. Author: Dylan Cali <calid1984@gmail.com>
  134. Date: Wed Mar 16 15:49:35 2016 -0400
  135.  
  136. add ohbye
  137.  
  138. commit 4191b914a72887c6fc6f2c1f59fdbc4ae21d3772
  139. Author: Dylan Cali <calid1984@gmail.com>
  140. Date: Wed Mar 16 15:48:12 2016 -0400
  141.  
  142. add some ohhai lines
  143.  
  144. commit 7b57f083c77cc3ecb71be6325d9d1c3c95697837
  145. Author: Dylan Cali <calid1984@gmail.com>
  146. Date: Wed Mar 16 15:47:57 2016 -0400
  147.  
  148. add foo
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement