Advertisement
Guest User

Untitled

a guest
Apr 20th, 2014
46
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 1.20 KB | None | 0 0
  1. o "ok" b6ca869 [my_branch*]
  2. |
  3. o "ok" 479d27c
  4. |
  5. o "ok" c80fad5
  6. |
  7. o "ok" 8f7fe87
  8. |
  9. o "master commit message" [master][remotes/origin/master]
  10.  
  11. o "my_branch commit message" [my_branch*]
  12. |
  13. o "master commit message" [master][remotes/origin/master]
  14.  
  15. git rebase --interactive master
  16.  
  17. GNU nano 2.2.2 File: /home/.git/modules/src/android/frameworks/base/rebase-merge/git-rebase-todo
  18.  
  19. pick 8f7fe87 ok
  20. pick c80fad5 ok
  21. pick 479d27c ok
  22. pick b6ca869 ok
  23.  
  24. # Rebase aeedb8f..b6ca869 onto aeedb8f
  25. #
  26. # Commands:
  27. # p, pick = use commit
  28. # r, reword = use commit, but edit the commit message
  29. # e, edit = use commit, but stop for amending
  30. # s, squash = use commit, but meld into previous commit
  31. # f, fixup = like "squash", but discard this commit's log message
  32. # x, exec = run command (the rest of the line) using shell
  33. #
  34. # These lines can be re-ordered; they are executed from top to bottom.
  35. #
  36. # If you remove a line here THAT COMMIT WILL BE LOST.
  37. #
  38. # However, if you remove everything, the rebase will be aborted.
  39. #
  40. # Note that empty commits are commented out
  41.  
  42. pick 8f7fe87 ok
  43. s c80fad5 ok
  44. s 479d27c ok
  45. s b6ca869 ok
  46.  
  47. pick 8f7fe87 ok
  48. s c80fad5 ok
  49. s 479d27c ok
  50. s b6ca869 ok
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement