Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- o "ok" b6ca869 [my_branch*]
- |
- o "ok" 479d27c
- |
- o "ok" c80fad5
- |
- o "ok" 8f7fe87
- |
- o "master commit message" [master][remotes/origin/master]
- o "my_branch commit message" [my_branch*]
- |
- o "master commit message" [master][remotes/origin/master]
- git rebase --interactive master
- GNU nano 2.2.2 File: /home/.git/modules/src/android/frameworks/base/rebase-merge/git-rebase-todo
- pick 8f7fe87 ok
- pick c80fad5 ok
- pick 479d27c ok
- pick b6ca869 ok
- # Rebase aeedb8f..b6ca869 onto aeedb8f
- #
- # Commands:
- # p, pick = use commit
- # r, reword = use commit, but edit the commit message
- # e, edit = use commit, but stop for amending
- # s, squash = use commit, but meld into previous commit
- # f, fixup = like "squash", but discard this commit's log message
- # x, exec = run command (the rest of the line) using shell
- #
- # These lines can be re-ordered; they are executed from top to bottom.
- #
- # If you remove a line here THAT COMMIT WILL BE LOST.
- #
- # However, if you remove everything, the rebase will be aborted.
- #
- # Note that empty commits are commented out
- pick 8f7fe87 ok
- s c80fad5 ok
- s 479d27c ok
- s b6ca869 ok
- pick 8f7fe87 ok
- s c80fad5 ok
- s 479d27c ok
- s b6ca869 ok
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement