1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
|
@span .fn {-pick} @span .var {-d620266} Fix various typos
@span .fn {-pick} @span .var {-59fa2b6} Add new blog post
@span .fn {-pick} @span .var {-4c45214} Fix another typo
@span .cmt {-# Rebase 10c3013..4c45214 onto 10c3013 (3 commands)}
@span .cmt {-#}
@span .cmt {-# Commands:}
@span .cmt {-# p, pick <commit> = use commit}
@span .cmt {-# r, reword <commit> = use commit, but edit the commit message}
@span .cmt {-# e, edit <commit> = use commit, but stop for amending}
@span .cmt {-# s, squash <commit> = use commit, but meld into previous commit}
@span .cmt {-# f, fixup [-C | -c] <commit> = like "squash" but keep only the previous}
@span .cmt {-# commit's log message, unless -C is used, in which case}
@span .cmt {-# keep only this commit's message; -c is same as -C but}
@span .cmt {-# opens the editor}
@span .cmt {-# x, exec <command> = run command (the rest of the line) using shell}
@span .cmt {-# b, break = stop here (continue rebase later with 'git rebase --continue')}
@span .cmt {-# d, drop <commit> = remove commit}
@span .cmt {-# l, label <label> = label current HEAD with a name}
@span .cmt {-# t, reset <label> = reset HEAD to a label}
@span .cmt {-# m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]}
@span .cmt {-# create a merge commit using the original merge commit's}
@span .cmt {-# message (or the oneline, if no original merge commit was}
@span .cmt {-# specified); use -c <commit> to reword the commit message}
@span .cmt {-# u, update-ref <ref> = track a placeholder for the <ref> to be updated}
@span .cmt {-# to this position in the new commits. The <ref> is}
@span .cmt {-# updated at the end of the rebase}
@span .cmt {-#}
@span .cmt {-# These lines can be re-ordered; they are executed from top to bottom.}
@span .cmt {-#}
@span .cmt {-# If you remove a line here THAT COMMIT WILL BE LOST.}
@span .cmt {-#}
@span .cmt {-# However, if you remove everything, the rebase will be aborted.}
@span .cmt {-#}
|
