Advertisement
grahamperrin

git rebase -i main

May 28th, 2023
57
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 1.66 KB | None | 0 0
  1. pick 6f2ce494d zfs-create(8): grammar, caution
  2. pick a90829e3a zfs-create(8): ZFS for swap: mention the FAQ doc
  3. pick d8a86c515 zfs-create(8): swap to zvol is prone to deadlock
  4.  
  5. # Rebase 0f03a4116..d8a86c515 onto 0f03a4116 (3 commands)
  6. #
  7. # Commands:
  8. # p, pick <commit> = use commit
  9. # r, reword <commit> = use commit, but edit the commit message
  10. # e, edit <commit> = use commit, but stop for amending
  11. # s, squash <commit> = use commit, but meld into previous commit
  12. # f, fixup [-C | -c] <commit> = like "squash" but keep only the previous
  13. # commit's log message, unless -C is used, in which case
  14. # keep only this commit's message; -c is same as -C but
  15. # opens the editor
  16. # x, exec <command> = run command (the rest of the line) using shell
  17. # b, break = stop here (continue rebase later with 'git rebase --continue')
  18. # d, drop <commit> = remove commit
  19. # l, label <label> = label current HEAD with a name
  20. # t, reset <label> = reset HEAD to a label
  21. # m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]
  22. # create a merge commit using the original merge commit's
  23. # message (or the oneline, if no original merge commit was
  24. # specified); use -c <commit> to reword the commit message
  25. # u, update-ref <ref> = track a placeholder for the <ref> to be updated
  26. # to this position in the new commits. The <ref> is
  27. # updated at the end of the rebase
  28. #
  29. # These lines can be re-ordered; they are executed from top to bottom.
  30. #
  31. # If you remove a line here THAT COMMIT WILL BE LOST.
  32. #
  33. # However, if you remove everything, the rebase will be aborted.
  34. #
  35.  
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement