File indexing completed on 2024-05-12 04:02:06
0001 <!DOCTYPE html> 0002 <html><head> 0003 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> 0004 <title>git-rebase</title> 0005 <meta name="generator" content="KF5::SyntaxHighlighting - Definition (Git Rebase) - Theme (Breeze Light)"/> 0006 </head><body style="background-color:#ffffff;color:#1f1c1b"><pre> 0007 <span style="font-weight:bold">pick</span><span style="color:#644a9b"> 318aceb</span><span style="color:#bf0303"> Add test for Makefile highlighting</span> 0008 <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> 0009 <span style="color:#b08000">r</span><span style="color:#644a9b"> 6f7d8a7</span><span style="color:#bf0303"> Sync xml files with KTextEditor</span> 0010 <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> 0011 <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> 0012 <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> 0013 <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> 0014 <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> 0015 <span style="color:#b08000">f</span><span style="color:#644a9b"> 5c7fd91</span><span style="color:#bf0303"> Add Kate 4.6 ASP syntax test</span> 0016 <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> 0017 <span style="color:#b08000">fixup</span><span style="color:#644a9b"> 7a777ff</span><span style="color:#bf0303"> Implement case-sensitive overrides for keyword rules</span> 0018 <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> 0019 <span style="color:#006e28">exec</span><span style="color:#bf0303"> 2b16665 Implement dynamic DetectChar rules</span> 0020 <span style="color:#006e28">x</span><span style="color:#bf0303"> 0b703a3 Add a few more tests from the Kate 4.6 test suite</span> 0021 <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> 0022 <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> 0023 <span style="color:#006e28">b</span><span style="color:#bf0303"> afafafaffa</span> 0024 <span style="color:#006e28">break</span><span style="color:#bf0303"> afafafaffa</span> 0025 <span style="color:#ca60ca">l</span><span style="color:#bf0303"> label</span> 0026 <span style="color:#ca60ca">label</span><span style="color:#bf0303"> afafafaffa</span> 0027 <span style="color:#ca60ca">t</span><span style="color:#bf0303"> label</span> 0028 <span style="color:#ca60ca">reset</span><span style="color:#bf0303"> afafafaffa</span> 0029 <span style="color:#006e28">m</span><span style="color:#644a9b"> </span><span style="color:#bf0303">label # bla bla bla</span> 0030 <span style="color:#006e28">merge</span><span style="color:#644a9b"> -c afafafaffa</span><span style="color:#bf0303"> label</span> 0031 <span style="color:#006e28">u</span><span style="color:#bf0303"> ref</span> 0032 <span style="color:#006e28">update-ref</span><span style="color:#bf0303"> ref</span> 0033 0034 <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> 0035 <span style="color:#898887">#</span> 0036 <span style="color:#898887"># Commands:</span> 0037 <span style="color:#898887"># p, pick <commit> = use commit</span> 0038 <span style="color:#898887"># r, reword <commit> = use commit, but edit the commit message</span> 0039 <span style="color:#898887"># e, edit <commit> = use commit, but stop for amending</span> 0040 <span style="color:#898887"># s, squash <commit> = use commit, but meld into previous commit</span> 0041 <span style="color:#898887"># f, fixup [-C | -c] <commit> = like "squash" but keep only the previous</span> 0042 <span style="color:#898887"># commit's log message, unless -C is used, in which case</span> 0043 <span style="color:#898887"># keep only this commit's message; -c is same as -C but</span> 0044 <span style="color:#898887"># opens the editor</span> 0045 <span style="color:#898887"># x, exec <command> = run command (the rest of the line) using shell</span> 0046 <span style="color:#898887"># b, break = stop here (continue rebase later with 'git rebase --continue')</span> 0047 <span style="color:#898887"># d, drop <commit> = remove commit</span> 0048 <span style="color:#898887"># l, label <label> = label current HEAD with a name</span> 0049 <span style="color:#898887"># t, reset <label> = reset HEAD to a label</span> 0050 <span style="color:#898887"># m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]</span> 0051 <span style="color:#898887"># create a merge commit using the original merge commit's</span> 0052 <span style="color:#898887"># message (or the oneline, if no original merge commit was</span> 0053 <span style="color:#898887"># specified); use -c <commit> to reword the commit message</span> 0054 <span style="color:#898887"># u, update-ref <ref> = track a placeholder for the <ref> to be updated</span> 0055 <span style="color:#898887"># to this position in the new commits. The <ref> is</span> 0056 <span style="color:#898887"># updated at the end of the rebase</span> 0057 <span style="color:#898887">#</span> 0058 <span style="color:#898887"># These lines can be re-ordered; they are executed from top to bottom.</span> 0059 <span style="color:#898887">#</span> 0060 <span style="color:#898887"># If you remove a line here THAT COMMIT WILL BE LOST.</span> 0061 <span style="color:#898887">#</span> 0062 <span style="color:#898887"># However, if you remove everything, the rebase will be aborted.</span> 0063 <span style="color:#898887">#</span> 0064 <span style="color:#898887"># Note that empty commits are commented out</span> 0065 </pre></body></html>