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