Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- pick 6f2ce494d zfs-create(8): grammar, caution
- pick a90829e3a zfs-create(8): ZFS for swap: mention the FAQ doc
- pick d8a86c515 zfs-create(8): swap to zvol is prone to deadlock
- # Rebase 0f03a4116..d8a86c515 onto 0f03a4116 (3 commands)
- #
- # Commands:
- # p, pick <commit> = use commit
- # r, reword <commit> = use commit, but edit the commit message
- # e, edit <commit> = use commit, but stop for amending
- # s, squash <commit> = use commit, but meld into previous commit
- # f, fixup [-C | -c] <commit> = like "squash" but keep only the previous
- # commit's log message, unless -C is used, in which case
- # keep only this commit's message; -c is same as -C but
- # opens the editor
- # x, exec <command> = run command (the rest of the line) using shell
- # b, break = stop here (continue rebase later with 'git rebase --continue')
- # d, drop <commit> = remove commit
- # l, label <label> = label current HEAD with a name
- # t, reset <label> = reset HEAD to a label
- # m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]
- # create a merge commit using the original merge commit's
- # message (or the oneline, if no original merge commit was
- # specified); use -c <commit> to reword the commit message
- # u, update-ref <ref> = track a placeholder for the <ref> to be updated
- # to this position in the new commits. The <ref> is
- # updated at the end of the rebase
- #
- # 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.
- #
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement