| 1 |
pick 318aceb Add test for Makefile highlighting |
| 2 |
p 4c7182a Add first batch of test files resurrected from Kate 4.6 |
| 3 |
r 6f7d8a7 Sync xml files with KTextEditor |
| 4 |
reword 8f0dbdc Add another batch of resurrected tests from Kate 4.6 |
| 5 |
e 828de45 Add some more resurrected tests from Kate 4.6 |
| 6 |
edit 6aa6264 Add simple coverage information for syntax definition tests |
| 7 |
s 63df253 Add more syntax highlighting tests from Kate 4.6 |
| 8 |
squash 3e7771f Add three more tests recovered from Kate 4.6 |
| 9 |
f 5c7fd91 Add Kate 4.6 ASP syntax test |
| 10 |
f -c 5c7fd91 Add Kate 4.6 ASP syntax test |
| 11 |
fixup 7a777ff Implement case-sensitive overrides for keyword rules |
| 12 |
fixup -C 7a777ff Implement case-sensitive overrides for keyword rules |
| 13 |
exec 2b16665 Implement dynamic DetectChar rules |
| 14 |
x 0b703a3 Add a few more tests from the Kate 4.6 test suite |
| 15 |
d dd808dc Quote captured strings we replace in regular expressions |
| 16 |
drop dd808dc Quote captured strings we replace in regular expressions |
| 17 |
b afafafaffa |
| 18 |
break afafafaffa |
| 19 |
l label |
| 20 |
label afafafaffa |
| 21 |
t label |
| 22 |
reset afafafaffa |
| 23 |
m label # bla bla bla |
| 24 |
merge -c afafafaffa label |
| 25 |
u ref |
| 26 |
update-ref ref |
| 27 |
|
| 28 |
# Rebase a27a854..0b703a3 onto a27a854 (13 command(s)) |
| 29 |
# |
| 30 |
# Commands: |
| 31 |
# p, pick <commit> = use commit |
| 32 |
# r, reword <commit> = use commit, but edit the commit message |
| 33 |
# e, edit <commit> = use commit, but stop for amending |
| 34 |
# s, squash <commit> = use commit, but meld into previous commit |
| 35 |
# f, fixup [-C | -c] <commit> = like "squash" but keep only the previous |
| 36 |
# commit's log message, unless -C is used, in which case |
| 37 |
# keep only this commit's message; -c is same as -C but |
| 38 |
# opens the editor |
| 39 |
# x, exec <command> = run command (the rest of the line) using shell |
| 40 |
# b, break = stop here (continue rebase later with 'git rebase --continue') |
| 41 |
# d, drop <commit> = remove commit |
| 42 |
# l, label <label> = label current HEAD with a name |
| 43 |
# t, reset <label> = reset HEAD to a label |
| 44 |
# m, merge [-C <commit> | -c <commit>] <label> [# <oneline>] |
| 45 |
# create a merge commit using the original merge commit's |
| 46 |
# message (or the oneline, if no original merge commit was |
| 47 |
# specified); use -c <commit> to reword the commit message |
| 48 |
# u, update-ref <ref> = track a placeholder for the <ref> to be updated |
| 49 |
# to this position in the new commits. The <ref> is |
| 50 |
# updated at the end of the rebase |
| 51 |
# |
| 52 |
# These lines can be re-ordered; they are executed from top to bottom. |
| 53 |
# |
| 54 |
# If you remove a line here THAT COMMIT WILL BE LOST. |
| 55 |
# |
| 56 |
# However, if you remove everything, the rebase will be aborted. |
| 57 |
# |
| 58 |
# Note that empty commits are commented out |