mirror of
https://github.com/jj-vcs/jj.git
synced 2025-12-23 06:01:01 +00:00
demos: re-generate demo images
This commit is contained in:
Scott Taylor
parent
3ac3685876
commit
bc4ed3eef1
11 changed files with 282 additions and 265 deletions
Binary file not shown.
|
Before Width: | Height: | Size: 75 KiB After Width: | Height: | Size: 85 KiB |
|
|
@ -1,5 +1,5 @@
|
|||
<!-- Created with term-transcript v0.3.0 (https://github.com/slowli/term-transcript) -->
|
||||
<svg viewBox="0 0 720 1604" width="720" height="1604" xmlns="http://www.w3.org/2000/svg">
|
||||
<!-- Created with term-transcript v0.4.0 (https://github.com/slowli/term-transcript) -->
|
||||
<svg viewBox="0 0 720 1856" width="720" height="1856" xmlns="http://www.w3.org/2000/svg">
|
||||
<style>
|
||||
.container {
|
||||
font: 14px Fira Code, Liberation Mono, SFMono-Regular, Consolas, Menlo, monospace;
|
||||
|
|
@ -33,22 +33,22 @@
|
|||
.fg15 { fill: #f2f2f2; } .output-bg .fg15 { stroke: #f2f2f2; }
|
||||
</style>
|
||||
<rect width="100%" height="100%" y="0" rx="4.5" style="fill: #0c0c0c;" />
|
||||
<svg x="0" y="10" width="720" height="1584" viewBox="0 0 720 1584">
|
||||
<svg x="0" y="10" width="720" height="1836" viewBox="0 0 720 1836">
|
||||
<g class="input-bg"></g>
|
||||
<text class="container fg7"><tspan xml:space="preserve" x="10" y="14" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="32" class="output"><tspan class="fg2"># Clone a Git repo:</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="50" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="68" class="output">$ jj git clone https://github.com/octocat/Hello-World
|
||||
</tspan><tspan xml:space="preserve" x="10" y="86" class="output">Fetching into new repo in "/private/var/folders/lj/rv4h95_d0mxb9ryztzpz4qph0000g<tspan class="hard-br" rotate="45" dx=".1em" dy="-.2em">↓</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="104" class="output">n/T/tmp.v3wfSIm7te/Hello-World"
|
||||
</tspan><tspan xml:space="preserve" x="10" y="122" class="output">bookmark: <tspan class="fg5">master@origin </tspan> [new] untracked
|
||||
</tspan><tspan xml:space="preserve" x="10" y="140" class="output">bookmark: <tspan class="fg5">octocat-patch-1@origin</tspan> [new] untracked
|
||||
</tspan><tspan xml:space="preserve" x="10" y="158" class="output">bookmark: <tspan class="fg5">test@origin </tspan> [new] untracked
|
||||
</tspan><tspan xml:space="preserve" x="10" y="176" class="output">Setting the revset alias "trunk()" to "master@origin"
|
||||
</tspan><tspan xml:space="preserve" x="10" y="194" class="output">Working copy now at: <tspan class="bold fg13">q</tspan><tspan class="bold fg8">otuunkp</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">d</tspan><tspan class="bold fg8">67be097</tspan><tspan class="bold"> </tspan><tspan class="bold fg10">(empty)</tspan><tspan class="bold"> </tspan><tspan class="bold fg10">(no description set)</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="212" class="output">Parent commit : <tspan class="bold fg5">o</tspan><tspan class="fg8">rrkosyo</tspan> <tspan class="bold fg4">7</tspan><tspan class="fg8">fd1a60b</tspan> <tspan class="fg5">master</tspan><tspan class="fg8"> | </tspan><tspan class="fg2">(empty)</tspan> Merge pull request #6 fr<tspan class="hard-br" rotate="45" dx=".1em" dy="-.2em">↓</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="230" class="output">om Spaceghost/patch-1
|
||||
</tspan><tspan xml:space="preserve" x="10" y="248" class="output">Added 1 files, modified 0 files, removed 0 files
|
||||
</tspan><tspan xml:space="preserve" x="10" y="86" class="output">Fetching into new repo in "/tmp/tmp.MSKYMYpbzf/Hello-World"
|
||||
</tspan><tspan xml:space="preserve" x="10" y="104" class="output">bookmark: <tspan class="fg5">master@origin </tspan> [new] tracked
|
||||
</tspan><tspan xml:space="preserve" x="10" y="122" class="output">bookmark: <tspan class="fg5">octocat-patch-1@origin</tspan> [new] untracked
|
||||
</tspan><tspan xml:space="preserve" x="10" y="140" class="output">bookmark: <tspan class="fg5">test@origin </tspan> [new] untracked
|
||||
</tspan><tspan xml:space="preserve" x="10" y="158" class="output">Setting the revset alias `trunk()` to `master@origin`
|
||||
</tspan><tspan xml:space="preserve" x="10" y="176" class="output">Working copy (@) now at: <tspan class="bold fg13">r</tspan><tspan class="bold fg8">yovlopo</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">6</tspan><tspan class="bold fg8">ae4c1dd</tspan><tspan class="bold"> </tspan><tspan class="bold fg10">(empty)</tspan><tspan class="bold"> </tspan><tspan class="bold fg10">(no description set)</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="194" class="output">Parent commit (@-) : <tspan class="bold fg5">o</tspan><tspan class="fg8">rrkosyo</tspan> <tspan class="bold fg4">7</tspan><tspan class="fg8">fd1a60b</tspan> <tspan class="fg5">master</tspan><tspan class="fg8"> | </tspan><tspan class="fg2">(empty)</tspan> Merge pull request <tspan class="hard-br" rotate="45" dx=".1em" dy="-.2em">↓</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="212" class="output">#6 from Spaceghost/patch-1
|
||||
</tspan><tspan xml:space="preserve" x="10" y="230" class="output">Added 1 files, modified 0 files, removed 0 files
|
||||
</tspan><tspan xml:space="preserve" x="10" y="248" class="output"><tspan class="bold fg6">Hint: </tspan>Running `git clean -xdf` will remove `.jj/`!
|
||||
</tspan><tspan xml:space="preserve" x="10" y="266" class="output">$ cd Hello-World
|
||||
</tspan><tspan xml:space="preserve" x="10" y="284" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="302" class="output">
|
||||
|
|
@ -57,72 +57,86 @@
|
|||
</tspan><tspan xml:space="preserve" x="10" y="356" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="374" class="output">$ jj bookmark list --all
|
||||
</tspan><tspan xml:space="preserve" x="10" y="392" class="output"><tspan class="fg5">master</tspan>: <tspan class="bold fg5">o</tspan><tspan class="fg8">rrkosyo</tspan> <tspan class="bold fg4">7</tspan><tspan class="fg8">fd1a60b</tspan> <tspan class="fg2">(empty)</tspan> Merge pull request #6 from Spaceghost/patch-1
|
||||
</tspan><tspan xml:space="preserve" x="10" y="410" class="output"> <tspan class="fg5">@origin</tspan>: <tspan class="bold fg5">o</tspan><tspan class="fg8">rrkosyo</tspan> <tspan class="bold fg4">7</tspan><tspan class="fg8">fd1a60b</tspan> <tspan class="fg2">(empty)</tspan> Merge pull request #6 from Spaceghost/patch<tspan class="hard-br" rotate="45" dx=".1em" dy="-.2em">↓</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="428" class="output">-1
|
||||
</tspan><tspan xml:space="preserve" x="10" y="446" class="output"><tspan class="fg5">octocat-patch-1@origin</tspan>: <tspan class="bold fg5">t</tspan><tspan class="fg8">pstlust</tspan> <tspan class="bold fg4">b1</tspan><tspan class="fg8">b3f972</tspan> sentence case
|
||||
</tspan><tspan xml:space="preserve" x="10" y="464" class="output"><tspan class="fg5">test@origin</tspan>: <tspan class="bold fg5">k</tspan><tspan class="fg8">owxouwz</tspan> <tspan class="bold fg4">b3</tspan><tspan class="fg8">cbd5bb</tspan> Create CONTRIBUTING.md
|
||||
</tspan><tspan xml:space="preserve" x="10" y="482" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="500" class="output"><tspan class="fg2"># We can create a local bookmark tracking one of the remote branches we just</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="518" class="output"><tspan class="fg2"># fetched.</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="536" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="554" class="output">$ jj bookmark track octocat-patch-1@origin
|
||||
</tspan><tspan xml:space="preserve" x="10" y="572" class="output">Started tracking 1 remote bookmarks.
|
||||
</tspan><tspan xml:space="preserve" x="10" y="590" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="608" class="output"><tspan class="fg2"># By default, "jj log" excludes untracked remote branches to focus on</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="626" class="output"><tspan class="fg2"># "our" commits.</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="644" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="662" class="output">$ jj log
|
||||
</tspan><tspan xml:space="preserve" x="10" y="680" class="output"><tspan class="bold fg2">@</tspan> <tspan class="bold fg13">q</tspan><tspan class="bold fg8">otuunkp</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@example.com</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">2024-10-13 19:54:52</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">d</tspan><tspan class="bold fg8">67be097</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="698" class="output">│ <tspan class="bold fg10">(empty)</tspan><tspan class="bold"> </tspan><tspan class="bold fg10">(no description set)</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="716" class="output">│ ○ <tspan class="bold fg5">t</tspan><tspan class="fg8">pstlust</tspan> <tspan class="fg3">support+octocat@github.com</tspan> <tspan class="fg6">2018-05-10 10:55:19</tspan> <tspan class="fg5">octocat-patch-1</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="734" class="output">├─╯ <tspan class="bold fg4">b</tspan><tspan class="fg8">1b3f972</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="752" class="output">│ sentence case
|
||||
</tspan><tspan xml:space="preserve" x="10" y="770" class="output"><tspan class="bold fg14">◆</tspan> <tspan class="bold fg5">o</tspan><tspan class="fg8">rrkosyo</tspan> <tspan class="fg3">octocat@nowhere.com</tspan> <tspan class="fg6">2012-03-06 16:06:50</tspan> <tspan class="fg5">master</tspan> <tspan class="bold fg4">7</tspan><tspan class="fg8">fd1a60b</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="788" class="output">│ <tspan class="fg2">(empty)</tspan> Merge pull request #6 from Spaceghost/patch-1
|
||||
</tspan><tspan xml:space="preserve" x="10" y="806" class="output">~
|
||||
</tspan><tspan xml:space="preserve" x="10" y="824" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="842" class="output"><tspan class="fg2"># We can also ask "jj" to show all the commits.</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="860" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="878" class="output">$ jj log -r 'all()'
|
||||
</tspan><tspan xml:space="preserve" x="10" y="896" class="output"><tspan class="bold fg2">@</tspan> <tspan class="bold fg13">q</tspan><tspan class="bold fg8">otuunkp</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@example.com</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">2024-10-13 19:54:52</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">d</tspan><tspan class="bold fg8">67be097</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="914" class="output">│ <tspan class="bold fg10">(empty)</tspan><tspan class="bold"> </tspan><tspan class="bold fg10">(no description set)</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="932" class="output">│ ○ <tspan class="bold fg5">t</tspan><tspan class="fg8">pstlust</tspan> <tspan class="fg3">support+octocat@github.com</tspan> <tspan class="fg6">2018-05-10 10:55:19</tspan> <tspan class="fg5">octocat-patch-1</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="950" class="output">├─╯ <tspan class="bold fg4">b</tspan><tspan class="fg8">1b3f972</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="968" class="output">│ sentence case
|
||||
</tspan><tspan xml:space="preserve" x="10" y="986" class="output">│ <tspan class="bold fg14">◆</tspan> <tspan class="bold fg5">k</tspan><tspan class="fg8">owxouwz</tspan> <tspan class="fg3">octocat@nowhere.com</tspan> <tspan class="fg6">2014-06-10 15:22:26</tspan> <tspan class="fg5">test@origin</tspan> <tspan class="bold fg4">b3</tspan><tspan class="fg8">cbd5bb</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1004" class="output">├─╯ Create CONTRIBUTING.md
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1022" class="output"><tspan class="bold fg14">◆</tspan> <tspan class="bold fg5">o</tspan><tspan class="fg8">rrkosyo</tspan> <tspan class="fg3">octocat@nowhere.com</tspan> <tspan class="fg6">2012-03-06 16:06:50</tspan> <tspan class="fg5">master</tspan> <tspan class="bold fg4">7</tspan><tspan class="fg8">fd1a60b</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1040" class="output">├─╮ <tspan class="fg2">(empty)</tspan> Merge pull request #6 from Spaceghost/patch-1
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1058" class="output">│ <tspan class="bold fg14">◆</tspan> <tspan class="bold fg5">n</tspan><tspan class="fg8">znozkvv</tspan> <tspan class="fg3">Johnneylee.rollins@gmail.com</tspan> <tspan class="fg6">2011-09-13 21:42:41</tspan> <tspan class="bold fg4">76</tspan><tspan class="fg8">294131</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1076" class="output">├─╯ New line at end of file. --Signed off by Spaceghost
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1094" class="output"><tspan class="bold fg14">◆</tspan> <tspan class="bold fg5">s</tspan><tspan class="fg8">yktoqts</tspan> <tspan class="fg3">cameron@github.com</tspan> <tspan class="fg6">2011-01-26 12:06:08</tspan> <tspan class="bold fg4">5</tspan><tspan class="fg8">53c2077</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1112" class="output">│ first commit
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1130" class="output"><tspan class="bold fg14">◆</tspan> <tspan class="bold fg5">zz</tspan><tspan class="fg8">zzzzzz</tspan> <tspan class="fg2">root()</tspan> <tspan class="bold fg4">0</tspan><tspan class="fg8">0000000</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1148" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1166" class="output"><tspan class="fg2"># We can look at the diffs of commits in the repo</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1184" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1202" class="output">$ jj diff -r b1
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1220" class="output"><tspan class="fg3">Modified regular file README:</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1238" class="output"><tspan class="fg1"> 1</tspan> <tspan class="fg2"> 1</tspan>: Hello <tspan class="underline fg1">World</tspan><tspan class="underline fg2">world</tspan>!
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1256" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1274" class="output">$ jj diff -r b3
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1292" class="output"><tspan class="fg3">Added regular file CONTRIBUTING.md:</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1310" class="output"> <tspan class="fg2"> 1</tspan>: <tspan class="underline fg2">## Contributing</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1328" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1346" class="output"><tspan class="fg2"># The repo is backed by the actual Git repo:</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1364" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1382" class="output">$ git --git-dir=.jj/repo/store/git log --graph --all --decorate --oneline
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1400" class="output">* <tspan class="fg3">8aaad6b</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1418" class="output">* <tspan class="fg3">d67be09</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1436" class="output"><tspan class="fg1">|</tspan> * <tspan class="fg3">b1b3f97</tspan><tspan class="fg3"> (</tspan><tspan class="bold fg1">origin/octocat-patch-1</tspan><tspan class="fg3">)</tspan> sentence case
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1454" class="output"><tspan class="fg1">|</tspan><tspan class="fg1">/</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1472" class="output"><tspan class="fg1">|</tspan> * <tspan class="fg3">b3cbd5b</tspan><tspan class="fg3"> (</tspan><tspan class="bold fg1">origin/test</tspan><tspan class="fg3">)</tspan> Create CONTRIBUTING.md
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1490" class="output"><tspan class="fg1">|</tspan><tspan class="fg1">/</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1508" class="output">* <tspan class="fg3">7fd1a60</tspan><tspan class="fg3"> (</tspan><tspan class="bold fg1">origin/master</tspan><tspan class="fg3">)</tspan> Merge pull request #6 from Spaceghost/patch-1
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1526" class="output"><tspan class="fg4">|</tspan><tspan class="fg5">\</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1544" class="output"><tspan class="fg4">|</tspan> * <tspan class="fg3">7629413</tspan> New line at end of file. --Signed off by Spaceghost
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1562" class="output"><tspan class="fg4">|</tspan><tspan class="fg4">/</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1580" class="output">* <tspan class="fg3">553c207</tspan> first commit
|
||||
</tspan><tspan xml:space="preserve" x="10" y="410" class="output"> <tspan class="fg5">@git</tspan>: <tspan class="bold fg5">o</tspan><tspan class="fg8">rrkosyo</tspan> <tspan class="bold fg4">7</tspan><tspan class="fg8">fd1a60b</tspan> <tspan class="fg2">(empty)</tspan> Merge pull request #6 from Spaceghost/patch-1
|
||||
</tspan><tspan xml:space="preserve" x="10" y="428" class="output"> <tspan class="fg5">@origin</tspan>: <tspan class="bold fg5">o</tspan><tspan class="fg8">rrkosyo</tspan> <tspan class="bold fg4">7</tspan><tspan class="fg8">fd1a60b</tspan> <tspan class="fg2">(empty)</tspan> Merge pull request #6 from Spaceghost/patch<tspan class="hard-br" rotate="45" dx=".1em" dy="-.2em">↓</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="446" class="output">-1
|
||||
</tspan><tspan xml:space="preserve" x="10" y="464" class="output"><tspan class="fg5">octocat-patch-1@origin</tspan>: <tspan class="bold fg5">t</tspan><tspan class="fg8">pstlust</tspan> <tspan class="bold fg4">b1</tspan><tspan class="fg8">b3f972</tspan> sentence case
|
||||
</tspan><tspan xml:space="preserve" x="10" y="482" class="output"><tspan class="fg5">test@origin</tspan>: <tspan class="bold fg5">k</tspan><tspan class="fg8">owxouwz</tspan> <tspan class="bold fg4">b3</tspan><tspan class="fg8">cbd5bb</tspan> Create CONTRIBUTING.md
|
||||
</tspan><tspan xml:space="preserve" x="10" y="500" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="518" class="output"><tspan class="fg2"># We can create a local bookmark tracking one of the remote branches we just</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="536" class="output"><tspan class="fg2"># fetched.</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="554" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="572" class="output">$ jj bookmark track octocat-patch-1 --remote=origin
|
||||
</tspan><tspan xml:space="preserve" x="10" y="590" class="output">Started tracking 1 remote bookmarks.
|
||||
</tspan><tspan xml:space="preserve" x="10" y="608" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="626" class="output"><tspan class="fg2"># By default, "jj log" excludes untracked remote branches to focus on</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="644" class="output"><tspan class="fg2"># "our" commits.</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="662" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="680" class="output">$ jj log
|
||||
</tspan><tspan xml:space="preserve" x="10" y="698" class="output"><tspan class="bold fg2">@</tspan> <tspan class="bold fg13">r</tspan><tspan class="bold fg8">yovlopo</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@example.com</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">2025-12-20 10:52:40</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">6</tspan><tspan class="bold fg8">ae4c1dd</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="716" class="output">│ <tspan class="bold fg10">(empty)</tspan><tspan class="bold"> </tspan><tspan class="bold fg10">(no description set)</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="734" class="output">│ ○ <tspan class="bold fg5">t</tspan><tspan class="fg8">pstlust</tspan> <tspan class="fg3">support+octocat@github.com</tspan> <tspan class="fg6">2018-05-10 11:55:19</tspan> <tspan class="fg5">octocat-patch-1</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="752" class="output">├─╯ <tspan class="bold fg4">b</tspan><tspan class="fg8">1b3f972</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="770" class="output">│ sentence case
|
||||
</tspan><tspan xml:space="preserve" x="10" y="788" class="output"><tspan class="bold fg14">◆</tspan> <tspan class="bold fg5">o</tspan><tspan class="fg8">rrkosyo</tspan> <tspan class="fg3">octocat@nowhere.com</tspan> <tspan class="fg6">2012-03-06 17:06:50</tspan> <tspan class="fg5">master</tspan> <tspan class="bold fg4">7</tspan><tspan class="fg8">fd1a60b</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="806" class="output">│ <tspan class="fg2">(empty)</tspan> Merge pull request #6 from Spaceghost/patch-1
|
||||
</tspan><tspan xml:space="preserve" x="10" y="824" class="output">~
|
||||
</tspan><tspan xml:space="preserve" x="10" y="842" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="860" class="output"><tspan class="fg2"># We can also ask "jj" to show all the commits.</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="878" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="896" class="output">$ jj log -r 'all()'
|
||||
</tspan><tspan xml:space="preserve" x="10" y="914" class="output"><tspan class="bold fg2">@</tspan> <tspan class="bold fg13">r</tspan><tspan class="bold fg8">yovlopo</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@example.com</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">2025-12-20 10:52:40</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">6</tspan><tspan class="bold fg8">ae4c1dd</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="932" class="output">│ <tspan class="bold fg10">(empty)</tspan><tspan class="bold"> </tspan><tspan class="bold fg10">(no description set)</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="950" class="output">│ ○ <tspan class="bold fg5">t</tspan><tspan class="fg8">pstlust</tspan> <tspan class="fg3">support+octocat@github.com</tspan> <tspan class="fg6">2018-05-10 11:55:19</tspan> <tspan class="fg5">octocat-patch-1</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="968" class="output">├─╯ <tspan class="bold fg4">b</tspan><tspan class="fg8">1b3f972</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="986" class="output">│ sentence case
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1004" class="output">│ <tspan class="bold fg14">◆</tspan> <tspan class="bold fg5">k</tspan><tspan class="fg8">owxouwz</tspan> <tspan class="fg3">octocat@nowhere.com</tspan> <tspan class="fg6">2014-06-10 16:22:26</tspan> <tspan class="fg5">test@origin</tspan> <tspan class="bold fg4">b3</tspan><tspan class="fg8">cbd5bb</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1022" class="output">├─╯ Create CONTRIBUTING.md
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1040" class="output"><tspan class="bold fg14">◆</tspan> <tspan class="bold fg5">o</tspan><tspan class="fg8">rrkosyo</tspan> <tspan class="fg3">octocat@nowhere.com</tspan> <tspan class="fg6">2012-03-06 17:06:50</tspan> <tspan class="fg5">master</tspan> <tspan class="bold fg4">7</tspan><tspan class="fg8">fd1a60b</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1058" class="output">├─╮ <tspan class="fg2">(empty)</tspan> Merge pull request #6 from Spaceghost/patch-1
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1076" class="output">│ <tspan class="bold fg14">◆</tspan> <tspan class="bold fg5">n</tspan><tspan class="fg8">znozkvv</tspan> <tspan class="fg3">Johnneylee.rollins@gmail.com</tspan> <tspan class="fg6">2011-09-13 22:42:41</tspan> <tspan class="bold fg4">76</tspan><tspan class="fg8">294131</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1094" class="output">├─╯ New line at end of file. --Signed off by Spaceghost
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1112" class="output"><tspan class="bold fg14">◆</tspan> <tspan class="bold fg5">s</tspan><tspan class="fg8">yktoqts</tspan> <tspan class="fg3">cameron@github.com</tspan> <tspan class="fg6">2011-01-26 13:06:08</tspan> <tspan class="bold fg4">5</tspan><tspan class="fg8">53c2077</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1130" class="output">│ first commit
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1148" class="output"><tspan class="bold fg14">◆</tspan> <tspan class="bold fg5">z</tspan><tspan class="fg8">zzzzzzz</tspan> <tspan class="fg2">root()</tspan> <tspan class="bold fg4">0</tspan><tspan class="fg8">0000000</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1166" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1184" class="output"><tspan class="fg2"># We can look at the diffs of commits in the repo</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1202" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1220" class="output">$ jj diff -r b1
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1238" class="output"><tspan class="fg3">Modified regular file README:</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1256" class="output"><tspan class="fg1"> 1</tspan> <tspan class="fg2"> 1</tspan>: Hello <tspan class="underline fg1">World</tspan><tspan class="underline fg2">world</tspan>!
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1274" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1292" class="output">$ jj diff -r b3
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1310" class="output"><tspan class="fg3">Added regular file CONTRIBUTING.md:</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1328" class="output"> <tspan class="fg2"> 1</tspan>: <tspan class="underline fg2">## Contributing</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1346" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1364" class="output"><tspan class="fg2"># We can generate a 'git format-patch' compatible diff</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1382" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1400" class="output">$ jj show --git --template git_format_patch_email_headers
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1418" class="output">From <tspan class="fg4">6ae4c1dde51e20fe84a32351314b3a4fafce8983</tspan> Mon Sep 17 00:00:00 2001
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1436" class="output">From: <tspan class="fg3">JJ Fan <jjfan@example.com></tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1454" class="output">Date: <tspan class="fg6">Sat, 20 Dec 2025 10:52:40 -0600</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1472" class="output">Subject: [PATCH]
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1490" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1508" class="output">---
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1526" class="output"> 0 files changed, 0 insertions(+), 0 deletions(-)
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1544" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1562" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1580" class="output"><tspan class="fg2"># The repo is backed by the actual Git repo:</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1598" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1616" class="output">$ git log --graph --all --decorate --oneline
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1634" class="output">* <tspan class="fg3">1328093</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1652" class="output">* <tspan class="fg3">6ae4c1d</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1670" class="output"><tspan class="fg1">|</tspan> * <tspan class="fg3">b1b3f97</tspan><tspan class="fg3"> (</tspan><tspan class="bold fg1">origin/octocat-patch-1</tspan><tspan class="fg3">, </tspan><tspan class="bold fg2">octocat-patch-1</tspan><tspan class="fg3">)</tspan> sentence case
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1688" class="output"><tspan class="fg1">|</tspan><tspan class="fg1">/</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1706" class="output"><tspan class="fg1">|</tspan> * <tspan class="fg3">b3cbd5b</tspan><tspan class="fg3"> (</tspan><tspan class="bold fg1">origin/test</tspan><tspan class="fg3">)</tspan> Create CONTRIBUTING.md
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1724" class="output"><tspan class="fg1">|</tspan><tspan class="fg1">/</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1742" class="output">* <tspan class="fg3">7fd1a60</tspan><tspan class="fg3"> (</tspan><tspan class="bold fg6">HEAD</tspan><tspan class="fg3">, </tspan><tspan class="bold fg1">origin/master</tspan><tspan class="fg3">, </tspan><tspan class="bold fg2">master</tspan><tspan class="fg3">)</tspan> Merge pull request #6 from Spaceghost/<tspan class="hard-br" rotate="45" dx=".1em" dy="-.2em">↓</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1760" class="output">patch-1
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1778" class="output"><tspan class="fg4">|</tspan><tspan class="fg5">\</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1796" class="output"><tspan class="fg4">|</tspan> * <tspan class="fg3">7629413</tspan> New line at end of file. --Signed off by Spaceghost
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1814" class="output"><tspan class="fg4">|</tspan><tspan class="fg4">/</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1832" class="output">* <tspan class="fg3">553c207</tspan> first commit
|
||||
</tspan></text>
|
||||
</svg>
|
||||
</svg>
|
||||
|
|
|
|||
|
Before Width: | Height: | Size: 16 KiB After Width: | Height: | Size: 18 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 61 KiB After Width: | Height: | Size: 63 KiB |
|
|
@ -1,4 +1,4 @@
|
|||
<!-- Created with term-transcript v0.3.0 (https://github.com/slowli/term-transcript) -->
|
||||
<!-- Created with term-transcript v0.4.0 (https://github.com/slowli/term-transcript) -->
|
||||
<svg viewBox="0 0 720 1496" width="720" height="1496" xmlns="http://www.w3.org/2000/svg">
|
||||
<style>
|
||||
.container {
|
||||
|
|
@ -40,13 +40,13 @@
|
|||
</tspan><tspan xml:space="preserve" x="10" y="50" class="output"><tspan class="fg2"># editing the same line:</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="68" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="86" class="output">$ jj log
|
||||
</tspan><tspan xml:space="preserve" x="10" y="104" class="output"><tspan class="bold fg2">@</tspan> <tspan class="bold fg13">x</tspan><tspan class="bold fg8">tlupomq</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@example.com</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">2024-10-13 19:54:53</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">f</tspan><tspan class="bold fg8">d822031</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="104" class="output"><tspan class="bold fg2">@</tspan> <tspan class="bold fg13">s</tspan><tspan class="bold fg8">zxzosus</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@example.com</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">2025-12-20 10:52:41</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">f</tspan><tspan class="bold fg8">94b29fc</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="122" class="output">│ <tspan class="bold fg10">(empty)</tspan><tspan class="bold"> </tspan><tspan class="bold fg10">(no description set)</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="140" class="output">○ <tspan class="bold fg5">vl</tspan><tspan class="fg8">rryzpm</tspan> <tspan class="fg3">jjfan@example.com</tspan> <tspan class="fg6">2024-10-13 19:54:53</tspan> <tspan class="fg5">third</tspan> <tspan class="bold fg4">e</tspan><tspan class="fg8">5609328</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="140" class="output">○ <tspan class="bold fg5">v</tspan><tspan class="fg8">umtmwut</tspan> <tspan class="fg3">jjfan@example.com</tspan> <tspan class="fg6">2025-12-20 10:52:41</tspan> <tspan class="fg5">third</tspan> <tspan class="bold fg4">a</tspan><tspan class="fg8">a8a05e7</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="158" class="output">│ third
|
||||
</tspan><tspan xml:space="preserve" x="10" y="176" class="output">○ <tspan class="bold fg5">vo</tspan><tspan class="fg8">zropow</tspan> <tspan class="fg3">jjfan@example.com</tspan> <tspan class="fg6">2024-10-13 19:54:53</tspan> <tspan class="fg5">second</tspan> <tspan class="bold fg4">8</tspan><tspan class="fg8">38a97d1</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="176" class="output">○ <tspan class="bold fg5">ql</tspan><tspan class="fg8">zwwqsu</tspan> <tspan class="fg3">jjfan@example.com</tspan> <tspan class="fg6">2025-12-20 10:52:41</tspan> <tspan class="fg5">second</tspan> <tspan class="bold fg4">c</tspan><tspan class="fg8">f7bdb56</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="194" class="output">│ second
|
||||
</tspan><tspan xml:space="preserve" x="10" y="212" class="output">○ <tspan class="bold fg5">y</tspan><tspan class="fg8">zkyuwyx</tspan> <tspan class="fg3">jjfan@example.com</tspan> <tspan class="fg6">2024-10-13 19:54:53</tspan> <tspan class="fg5">first</tspan> <tspan class="bold fg4">d</tspan><tspan class="fg8">11b168f</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="212" class="output">○ <tspan class="bold fg5">qw</tspan><tspan class="fg8">vsxpoo</tspan> <tspan class="fg3">jjfan@example.com</tspan> <tspan class="fg6">2025-12-20 10:52:41</tspan> <tspan class="fg5">first</tspan> <tspan class="bold fg4">8</tspan><tspan class="fg8">e053ffa</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="230" class="output">│ first
|
||||
</tspan><tspan xml:space="preserve" x="10" y="248" class="output"><tspan class="bold fg14">◆</tspan> <tspan class="bold fg5">z</tspan><tspan class="fg8">zzzzzzz</tspan> <tspan class="fg2">root()</tspan> <tspan class="bold fg4">0</tspan><tspan class="fg8">0000000</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="266" class="output">$ jj diff -r first
|
||||
|
|
@ -61,18 +61,18 @@
|
|||
</tspan><tspan xml:space="preserve" x="10" y="428" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="446" class="output"><tspan class="fg2"># Let's reorder the second and third commits:</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="464" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="482" class="output">$ jj rebase -s third -d first
|
||||
</tspan><tspan xml:space="preserve" x="10" y="482" class="output">$ jj rebase -s third --onto first
|
||||
</tspan><tspan xml:space="preserve" x="10" y="500" class="output"><tspan class="fg8">... (output redacted) ...</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="518" class="output">$ jj rebase -s second -d third
|
||||
</tspan><tspan xml:space="preserve" x="10" y="536" class="output">Rebased 1 commits
|
||||
</tspan><tspan xml:space="preserve" x="10" y="518" class="output">$ jj rebase -s second --onto third
|
||||
</tspan><tspan xml:space="preserve" x="10" y="536" class="output">Rebased 1 commits to destination
|
||||
</tspan><tspan xml:space="preserve" x="10" y="554" class="output">$ jj log
|
||||
</tspan><tspan xml:space="preserve" x="10" y="572" class="output">○ <tspan class="bold fg5">vo</tspan><tspan class="fg8">zropow</tspan> <tspan class="fg3">jjfan@example.com</tspan> <tspan class="fg6">2024-10-13 19:54:54</tspan> <tspan class="fg5">second</tspan> <tspan class="bold fg4">b</tspan><tspan class="fg8">ab527f4</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="590" class="output">│ second
|
||||
</tspan><tspan xml:space="preserve" x="10" y="608" class="output">│ <tspan class="bold fg9">@</tspan> <tspan class="bold fg13">x</tspan><tspan class="bold fg8">tlupomq</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@example.com</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">2024-10-13 19:54:54</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">c</tspan><tspan class="bold fg8">ccec5aa</tspan><tspan class="bold"> </tspan><tspan class="bold fg9">conflict</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="626" class="output">├─╯ <tspan class="bold fg10">(empty)</tspan><tspan class="bold"> </tspan><tspan class="bold fg10">(no description set)</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="644" class="output"><tspan class="bold fg1">×</tspan> <tspan class="bold fg5">vl</tspan><tspan class="fg8">rryzpm</tspan> <tspan class="fg3">jjfan@example.com</tspan> <tspan class="fg6">2024-10-13 19:54:54</tspan> <tspan class="fg5">third</tspan> <tspan class="bold fg4">2</tspan><tspan class="fg8">52149ab</tspan> <tspan class="fg1">conflict</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="572" class="output"><tspan class="bold fg1">@</tspan> <tspan class="bold fg13">s</tspan><tspan class="bold fg8">zxzosus</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@example.com</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">2025-12-20 10:52:42</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">2</tspan><tspan class="bold fg8">d65cfa2</tspan><tspan class="bold"> </tspan><tspan class="bold fg9">conflict</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="590" class="output">│ <tspan class="bold fg10">(empty)</tspan><tspan class="bold"> </tspan><tspan class="bold fg10">(no description set)</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="608" class="output">│ ○ <tspan class="bold fg5">ql</tspan><tspan class="fg8">zwwqsu</tspan> <tspan class="fg3">jjfan@example.com</tspan> <tspan class="fg6">2025-12-20 10:52:42</tspan> <tspan class="fg5">second</tspan> <tspan class="bold fg4">1</tspan><tspan class="fg8">50c471b</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="626" class="output">├─╯ second
|
||||
</tspan><tspan xml:space="preserve" x="10" y="644" class="output"><tspan class="bold fg1">×</tspan> <tspan class="bold fg5">v</tspan><tspan class="fg8">umtmwut</tspan> <tspan class="fg3">jjfan@example.com</tspan> <tspan class="fg6">2025-12-20 10:52:42</tspan> <tspan class="fg5">third</tspan> <tspan class="bold fg4">8b</tspan><tspan class="fg8">0a03b6</tspan> <tspan class="fg1">conflict</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="662" class="output">│ third
|
||||
</tspan><tspan xml:space="preserve" x="10" y="680" class="output">○ <tspan class="bold fg5">y</tspan><tspan class="fg8">zkyuwyx</tspan> <tspan class="fg3">jjfan@example.com</tspan> <tspan class="fg6">2024-10-13 19:54:53</tspan> <tspan class="fg5">first</tspan> <tspan class="bold fg4">d</tspan><tspan class="fg8">11b168f</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="680" class="output">○ <tspan class="bold fg5">qw</tspan><tspan class="fg8">vsxpoo</tspan> <tspan class="fg3">jjfan@example.com</tspan> <tspan class="fg6">2025-12-20 10:52:41</tspan> <tspan class="fg5">first</tspan> <tspan class="bold fg4">8e</tspan><tspan class="fg8">053ffa</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="698" class="output">│ first
|
||||
</tspan><tspan xml:space="preserve" x="10" y="716" class="output"><tspan class="bold fg14">◆</tspan> <tspan class="bold fg5">z</tspan><tspan class="fg8">zzzzzzz</tspan> <tspan class="fg2">root()</tspan> <tspan class="bold fg4">0</tspan><tspan class="fg8">0000000</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="734" class="output">
|
||||
|
|
@ -83,8 +83,8 @@
|
|||
</tspan><tspan xml:space="preserve" x="10" y="824" class="output"><tspan class="fg2"># Let's verify that by looking at its contents:</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="842" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="860" class="output">$ jj new second
|
||||
</tspan><tspan xml:space="preserve" x="10" y="878" class="output">Working copy now at: <tspan class="bold fg13">l</tspan><tspan class="bold fg8">wwotoor</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">7</tspan><tspan class="bold fg8">d2b3194</tspan><tspan class="bold"> </tspan><tspan class="bold fg10">(empty)</tspan><tspan class="bold"> </tspan><tspan class="bold fg10">(no description set)</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="896" class="output">Parent commit : <tspan class="bold fg5">vo</tspan><tspan class="fg8">zropow</tspan> <tspan class="bold fg4">b</tspan><tspan class="fg8">ab527f4</tspan> <tspan class="fg5">second</tspan><tspan class="fg8"> | </tspan>second
|
||||
</tspan><tspan xml:space="preserve" x="10" y="878" class="output">Working copy (@) now at: <tspan class="bold fg13">zn</tspan><tspan class="bold fg8">tqlwox</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">2</tspan><tspan class="bold fg8">245f80b</tspan><tspan class="bold"> </tspan><tspan class="bold fg10">(empty)</tspan><tspan class="bold"> </tspan><tspan class="bold fg10">(no description set)</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="896" class="output">Parent commit (@-) : <tspan class="bold fg5">ql</tspan><tspan class="fg8">zwwqsu</tspan> <tspan class="bold fg4">1</tspan><tspan class="fg8">50c471b</tspan> <tspan class="fg5">second</tspan><tspan class="fg8"> | </tspan>second
|
||||
</tspan><tspan xml:space="preserve" x="10" y="914" class="output">Added 0 files, modified 1 files, removed 0 files
|
||||
</tspan><tspan xml:space="preserve" x="10" y="932" class="output">$ cat file
|
||||
</tspan><tspan xml:space="preserve" x="10" y="950" class="output">third
|
||||
|
|
@ -92,24 +92,24 @@
|
|||
</tspan><tspan xml:space="preserve" x="10" y="986" class="output"><tspan class="fg2"># Let's now instead make "second" and "third"</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1004" class="output"><tspan class="fg2"># sibling and merge them:</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1022" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1040" class="output">$ jj rebase -s second -d first
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1058" class="output">Rebased 2 commits
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1076" class="output">Working copy now at: <tspan class="bold fg13">l</tspan><tspan class="bold fg8">wwotoor</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">f</tspan><tspan class="bold fg8">6445745</tspan><tspan class="bold"> </tspan><tspan class="bold fg10">(empty)</tspan><tspan class="bold"> </tspan><tspan class="bold fg10">(no description set)</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1094" class="output">Parent commit : <tspan class="bold fg5">vo</tspan><tspan class="fg8">zropow</tspan> <tspan class="bold fg4">5</tspan><tspan class="fg8">ccf5c89</tspan> <tspan class="fg5">second</tspan><tspan class="fg8"> | </tspan>second
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1040" class="output">$ jj rebase -s second --onto first
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1058" class="output">Rebased 2 commits to destination
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1076" class="output">Working copy (@) now at: <tspan class="bold fg13">zn</tspan><tspan class="bold fg8">tqlwox</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">08</tspan><tspan class="bold fg8">479ee3</tspan><tspan class="bold"> </tspan><tspan class="bold fg10">(empty)</tspan><tspan class="bold"> </tspan><tspan class="bold fg10">(no description set)</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1094" class="output">Parent commit (@-) : <tspan class="bold fg5">ql</tspan><tspan class="fg8">zwwqsu</tspan> <tspan class="bold fg4">a</tspan><tspan class="fg8">9f1a65e</tspan> <tspan class="fg5">second</tspan><tspan class="fg8"> | </tspan>second
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1112" class="output">Added 0 files, modified 1 files, removed 0 files
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1130" class="output">$ jj new second third -m merged
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1148" class="output">Working copy now at: <tspan class="bold fg13">k</tspan><tspan class="bold fg8">tkzxtmq</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">2d</tspan><tspan class="bold fg8">d72c52</tspan><tspan class="bold"> </tspan><tspan class="bold fg10">(empty)</tspan><tspan class="bold"> merged</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1166" class="output">Parent commit : <tspan class="bold fg5">vo</tspan><tspan class="fg8">zropow</tspan> <tspan class="bold fg4">5</tspan><tspan class="fg8">ccf5c89</tspan> <tspan class="fg5">second</tspan><tspan class="fg8"> | </tspan>second
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1184" class="output">Parent commit : <tspan class="bold fg5">vl</tspan><tspan class="fg8">rryzpm</tspan> <tspan class="bold fg4">25</tspan><tspan class="fg8">2149ab</tspan> <tspan class="fg5">third</tspan><tspan class="fg8"> | </tspan><tspan class="fg1">(conflict)</tspan> third
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1148" class="output">Working copy (@) now at: <tspan class="bold fg13">k</tspan><tspan class="bold fg8">tppppyk</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">2</tspan><tspan class="bold fg8">f5da5f2</tspan><tspan class="bold"> </tspan><tspan class="bold fg10">(empty)</tspan><tspan class="bold"> merged</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1166" class="output">Parent commit (@-) : <tspan class="bold fg5">ql</tspan><tspan class="fg8">zwwqsu</tspan> <tspan class="bold fg4">a</tspan><tspan class="fg8">9f1a65e</tspan> <tspan class="fg5">second</tspan><tspan class="fg8"> | </tspan>second
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1184" class="output">Parent commit (@-) : <tspan class="bold fg5">v</tspan><tspan class="fg8">umtmwut</tspan> <tspan class="bold fg4">8b</tspan><tspan class="fg8">0a03b6</tspan> <tspan class="fg5">third</tspan><tspan class="fg8"> | </tspan><tspan class="fg1">(conflict)</tspan> third
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1202" class="output">Added 0 files, modified 1 files, removed 0 files
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1220" class="output">$ jj log
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1238" class="output"><tspan class="bold fg2">@</tspan> <tspan class="bold fg13">k</tspan><tspan class="bold fg8">tkzxtmq</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@example.com</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">2024-10-13 19:54:54</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">2d</tspan><tspan class="bold fg8">d72c52</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1238" class="output"><tspan class="bold fg2">@</tspan> <tspan class="bold fg13">k</tspan><tspan class="bold fg8">tppppyk</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@example.com</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">2025-12-20 10:52:42</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">2</tspan><tspan class="bold fg8">f5da5f2</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1256" class="output">├─╮ <tspan class="bold fg10">(empty)</tspan><tspan class="bold"> merged</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1274" class="output">│ <tspan class="bold fg1">×</tspan> <tspan class="bold fg5">vl</tspan><tspan class="fg8">rryzpm</tspan> <tspan class="fg3">jjfan@example.com</tspan> <tspan class="fg6">2024-10-13 19:54:54</tspan> <tspan class="fg5">third</tspan> <tspan class="bold fg4">25</tspan><tspan class="fg8">2149ab</tspan> <tspan class="fg1">conflict</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1274" class="output">│ <tspan class="bold fg1">×</tspan> <tspan class="bold fg5">v</tspan><tspan class="fg8">umtmwut</tspan> <tspan class="fg3">jjfan@example.com</tspan> <tspan class="fg6">2025-12-20 10:52:42</tspan> <tspan class="fg5">third</tspan> <tspan class="bold fg4">8b</tspan><tspan class="fg8">0a03b6</tspan> <tspan class="fg1">conflict</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1292" class="output">│ │ third
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1310" class="output">○ │ <tspan class="bold fg5">vo</tspan><tspan class="fg8">zropow</tspan> <tspan class="fg3">jjfan@example.com</tspan> <tspan class="fg6">2024-10-13 19:54:54</tspan> <tspan class="fg5">second</tspan> <tspan class="bold fg4">5</tspan><tspan class="fg8">ccf5c89</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1310" class="output">○ │ <tspan class="bold fg5">ql</tspan><tspan class="fg8">zwwqsu</tspan> <tspan class="fg3">jjfan@example.com</tspan> <tspan class="fg6">2025-12-20 10:52:42</tspan> <tspan class="fg5">second</tspan> <tspan class="bold fg4">a</tspan><tspan class="fg8">9f1a65e</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1328" class="output">├─╯ second
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1346" class="output">○ <tspan class="bold fg5">y</tspan><tspan class="fg8">zkyuwyx</tspan> <tspan class="fg3">jjfan@example.com</tspan> <tspan class="fg6">2024-10-13 19:54:53</tspan> <tspan class="fg5">first</tspan> <tspan class="bold fg4">d</tspan><tspan class="fg8">11b168f</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1346" class="output">○ <tspan class="bold fg5">qw</tspan><tspan class="fg8">vsxpoo</tspan> <tspan class="fg3">jjfan@example.com</tspan> <tspan class="fg6">2025-12-20 10:52:41</tspan> <tspan class="fg5">first</tspan> <tspan class="bold fg4">8e</tspan><tspan class="fg8">053ffa</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1364" class="output">│ first
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1382" class="output"><tspan class="bold fg14">◆</tspan> <tspan class="bold fg5">z</tspan><tspan class="fg8">zzzzzzz</tspan> <tspan class="fg2">root()</tspan> <tspan class="bold fg4">0</tspan><tspan class="fg8">0000000</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1400" class="output">
|
||||
|
|
|
|||
|
Before Width: | Height: | Size: 16 KiB After Width: | Height: | Size: 16 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 129 KiB After Width: | Height: | Size: 130 KiB |
|
|
@ -1,4 +1,4 @@
|
|||
<!-- Created with term-transcript v0.3.0 (https://github.com/slowli/term-transcript) -->
|
||||
<!-- Created with term-transcript v0.4.0 (https://github.com/slowli/term-transcript) -->
|
||||
<svg viewBox="0 0 720 2468" width="720" height="2468" xmlns="http://www.w3.org/2000/svg">
|
||||
<style>
|
||||
.container {
|
||||
|
|
@ -41,22 +41,22 @@
|
|||
</tspan><tspan xml:space="preserve" x="10" y="68" class="output"><tspan class="fg2"># so far:</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="86" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="104" class="output">$ jj op log
|
||||
</tspan><tspan xml:space="preserve" x="10" y="122" class="output"><tspan class="bold fg2">@</tspan> <tspan class="bold fg12">413275ffdc63</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@jujube</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">now, lasted less than a microsecond</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="122" class="output"><tspan class="bold fg2">@</tspan> <tspan class="bold fg12">7ec5c43d77e6</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@jujube</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">now, lasted 2 milliseconds</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="140" class="output">│ <tspan class="bold">track remote bookmark test@origin</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="158" class="output">│ <tspan class="bold fg5">args: jj bookmark track test@origin</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="176" class="output">○ <tspan class="fg4">ef68b3109893</tspan> <tspan class="fg3">jjfan@jujube</tspan> <tspan class="fg6">now, lasted 1 millisecond</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="194" class="output">│ forget bookmark octocat-patch-1
|
||||
</tspan><tspan xml:space="preserve" x="10" y="212" class="output">│ <tspan class="fg5">args: jj bookmark forget octocat-patch-1</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="230" class="output">○ <tspan class="fg4">71f27ab6c268</tspan> <tspan class="fg3">jjfan@jujube</tspan> <tspan class="fg6">now, lasted 2 milliseconds</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="248" class="output">│ abandon commit b1b3f9723831141a31a1a7252a213e216ea76e56
|
||||
</tspan><tspan xml:space="preserve" x="10" y="266" class="output">│ <tspan class="fg5">args: jj abandon --ignore-immutable octocat-patch-1@origin</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="284" class="output">○ <tspan class="fg4">2d2cbb3a7b4f</tspan> <tspan class="fg3">jjfan@jujube</tspan> <tspan class="fg6">now, lasted 3 milliseconds</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="302" class="output">│ check out git remote's default branch
|
||||
</tspan><tspan xml:space="preserve" x="10" y="158" class="output">│ <tspan class="bold fg13">args: jj bookmark track test@origin</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="176" class="output">○ <tspan class="fg4">bcb99cfdeaf6</tspan> <tspan class="fg3">jjfan@jujube</tspan> <tspan class="fg6">now, lasted 1 millisecond</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="194" class="output">│ abandon commit b1b3f9723831141a31a1a7252a213e216ea76e56
|
||||
</tspan><tspan xml:space="preserve" x="10" y="212" class="output">│ <tspan class="fg5">args: jj abandon --ignore-immutable octocat-patch-1@origin</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="230" class="output">○ <tspan class="fg4">cbd79734a463</tspan> <tspan class="fg3">jjfan@jujube</tspan> <tspan class="fg6">now, lasted 2 milliseconds</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="248" class="output">│ check out git remote's branch: master
|
||||
</tspan><tspan xml:space="preserve" x="10" y="266" class="output">│ <tspan class="fg5">args: jj git clone https://github.com/octocat/Hello-World</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="284" class="output">○ <tspan class="fg4">3fc0a75cf213</tspan> <tspan class="fg3">jjfan@jujube</tspan> <tspan class="fg6">now, lasted 501 milliseconds</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="302" class="output">│ fetch from git remote into empty repo
|
||||
</tspan><tspan xml:space="preserve" x="10" y="320" class="output">│ <tspan class="fg5">args: jj git clone https://github.com/octocat/Hello-World</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="338" class="output">○ <tspan class="fg4">226119260984</tspan> <tspan class="fg3">jjfan@jujube</tspan> <tspan class="fg6">now, lasted 540 milliseconds</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="356" class="output">│ fetch from git remote into empty repo
|
||||
</tspan><tspan xml:space="preserve" x="10" y="338" class="output">○ <tspan class="fg4">d4346f1d7d11</tspan> <tspan class="fg3">jjfan@jujube</tspan> <tspan class="fg6">now, lasted 1 millisecond</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="356" class="output">│ add git remote origin
|
||||
</tspan><tspan xml:space="preserve" x="10" y="374" class="output">│ <tspan class="fg5">args: jj git clone https://github.com/octocat/Hello-World</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="392" class="output">○ <tspan class="fg4">3ec4bb144f11</tspan> <tspan class="fg3">jjfan@jujube</tspan> <tspan class="fg6">now, lasted 15 milliseconds</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="392" class="output">○ <tspan class="fg4">385e3588a326</tspan> <tspan class="fg3">jjfan@jujube</tspan> <tspan class="fg6">now, lasted 3 milliseconds</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="410" class="output">│ add workspace 'default'
|
||||
</tspan><tspan xml:space="preserve" x="10" y="428" class="output">○ <tspan class="fg4">000000000000</tspan> <tspan class="fg2">root()</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="446" class="output">
|
||||
|
|
@ -66,38 +66,38 @@
|
|||
</tspan><tspan xml:space="preserve" x="10" y="518" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="536" class="output">$ echo stuff > new-file
|
||||
</tspan><tspan xml:space="preserve" x="10" y="554" class="output">$ jj describe -m stuff
|
||||
</tspan><tspan xml:space="preserve" x="10" y="572" class="output">Working copy now at: <tspan class="bold fg13">w</tspan><tspan class="bold fg8">yqozymx</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">a</tspan><tspan class="bold fg8">e764306</tspan><tspan class="bold"> stuff</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="590" class="output">Parent commit : <tspan class="bold fg5">o</tspan><tspan class="fg8">rrkosyo</tspan> <tspan class="bold fg4">7</tspan><tspan class="fg8">fd1a60b</tspan> <tspan class="fg5">master</tspan><tspan class="fg8"> | </tspan><tspan class="fg2">(empty)</tspan> Merge pull request #6 fr<tspan class="hard-br" rotate="45" dx=".1em" dy="-.2em">↓</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="608" class="output">om Spaceghost/patch-1
|
||||
</tspan><tspan xml:space="preserve" x="10" y="626" class="output">$ jj rebase -d test
|
||||
</tspan><tspan xml:space="preserve" x="10" y="644" class="output">Rebased 1 commits
|
||||
</tspan><tspan xml:space="preserve" x="10" y="662" class="output">Working copy now at: <tspan class="bold fg13">w</tspan><tspan class="bold fg8">yqozymx</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">c</tspan><tspan class="bold fg8">816cafa</tspan><tspan class="bold"> stuff</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="680" class="output">Parent commit : <tspan class="bold fg5">k</tspan><tspan class="fg8">owxouwz</tspan> <tspan class="bold fg4">b</tspan><tspan class="fg8">3cbd5bb</tspan> <tspan class="fg5">test</tspan><tspan class="fg8"> | </tspan>Create CONTRIBUTING.md
|
||||
</tspan><tspan xml:space="preserve" x="10" y="572" class="output">Working copy (@) now at: <tspan class="bold fg13">m</tspan><tspan class="bold fg8">kywokqk</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">bc</tspan><tspan class="bold fg8">757fe5</tspan><tspan class="bold"> stuff</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="590" class="output">Parent commit (@-) : <tspan class="bold fg5">o</tspan><tspan class="fg8">rrkosyo</tspan> <tspan class="bold fg4">7</tspan><tspan class="fg8">fd1a60b</tspan> <tspan class="fg5">master</tspan><tspan class="fg8"> | </tspan><tspan class="fg2">(empty)</tspan> Merge pull request <tspan class="hard-br" rotate="45" dx=".1em" dy="-.2em">↓</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="608" class="output">#6 from Spaceghost/patch-1
|
||||
</tspan><tspan xml:space="preserve" x="10" y="626" class="output">$ jj rebase --onto test
|
||||
</tspan><tspan xml:space="preserve" x="10" y="644" class="output">Rebased 1 commits to destination
|
||||
</tspan><tspan xml:space="preserve" x="10" y="662" class="output">Working copy (@) now at: <tspan class="bold fg13">m</tspan><tspan class="bold fg8">kywokqk</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">6</tspan><tspan class="bold fg8">be3d3bd</tspan><tspan class="bold"> stuff</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="680" class="output">Parent commit (@-) : <tspan class="bold fg5">k</tspan><tspan class="fg8">owxouwz</tspan> <tspan class="bold fg4">b</tspan><tspan class="fg8">3cbd5bb</tspan> <tspan class="fg5">test</tspan><tspan class="fg8"> | </tspan>Create CONTRIBUTING.md
|
||||
</tspan><tspan xml:space="preserve" x="10" y="698" class="output">Added 1 files, modified 0 files, removed 0 files
|
||||
</tspan><tspan xml:space="preserve" x="10" y="716" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="734" class="output"><tspan class="fg2"># We are now going to make another change off of</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="752" class="output"><tspan class="fg2"># master:</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="770" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="788" class="output">$ jj new master
|
||||
</tspan><tspan xml:space="preserve" x="10" y="806" class="output">Working copy now at: <tspan class="bold fg13">t</tspan><tspan class="bold fg8">soomuvq</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">a</tspan><tspan class="bold fg8">a67e541</tspan><tspan class="bold"> </tspan><tspan class="bold fg10">(empty)</tspan><tspan class="bold"> </tspan><tspan class="bold fg10">(no description set)</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="824" class="output">Parent commit : <tspan class="bold fg5">o</tspan><tspan class="fg8">rrkosyo</tspan> <tspan class="bold fg4">7</tspan><tspan class="fg8">fd1a60b</tspan> <tspan class="fg5">master</tspan><tspan class="fg8"> | </tspan><tspan class="fg2">(empty)</tspan> Merge pull request #6 fr<tspan class="hard-br" rotate="45" dx=".1em" dy="-.2em">↓</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="842" class="output">om Spaceghost/patch-1
|
||||
</tspan><tspan xml:space="preserve" x="10" y="806" class="output">Working copy (@) now at: <tspan class="bold fg13">l</tspan><tspan class="bold fg8">mxvvuro</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">e</tspan><tspan class="bold fg8">23df82b</tspan><tspan class="bold"> </tspan><tspan class="bold fg10">(empty)</tspan><tspan class="bold"> </tspan><tspan class="bold fg10">(no description set)</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="824" class="output">Parent commit (@-) : <tspan class="bold fg5">o</tspan><tspan class="fg8">rrkosyo</tspan> <tspan class="bold fg4">7</tspan><tspan class="fg8">fd1a60b</tspan> <tspan class="fg5">master</tspan><tspan class="fg8"> | </tspan><tspan class="fg2">(empty)</tspan> Merge pull request <tspan class="hard-br" rotate="45" dx=".1em" dy="-.2em">↓</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="842" class="output">#6 from Spaceghost/patch-1
|
||||
</tspan><tspan xml:space="preserve" x="10" y="860" class="output">Added 0 files, modified 0 files, removed 2 files
|
||||
</tspan><tspan xml:space="preserve" x="10" y="878" class="output">$ jj describe -m "other stuff"
|
||||
</tspan><tspan xml:space="preserve" x="10" y="896" class="output">Working copy now at: <tspan class="bold fg13">t</tspan><tspan class="bold fg8">soomuvq</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">1</tspan><tspan class="bold fg8">44081d4</tspan><tspan class="bold"> </tspan><tspan class="bold fg10">(empty)</tspan><tspan class="bold"> other stuff</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="914" class="output">Parent commit : <tspan class="bold fg5">o</tspan><tspan class="fg8">rrkosyo</tspan> <tspan class="bold fg4">7</tspan><tspan class="fg8">fd1a60b</tspan> <tspan class="fg5">master</tspan><tspan class="fg8"> | </tspan><tspan class="fg2">(empty)</tspan> Merge pull request #6 fr<tspan class="hard-br" rotate="45" dx=".1em" dy="-.2em">↓</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="932" class="output">om Spaceghost/patch-1
|
||||
</tspan><tspan xml:space="preserve" x="10" y="896" class="output">Working copy (@) now at: <tspan class="bold fg13">l</tspan><tspan class="bold fg8">mxvvuro</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">8</tspan><tspan class="bold fg8">fbe3619</tspan><tspan class="bold"> </tspan><tspan class="bold fg10">(empty)</tspan><tspan class="bold"> other stuff</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="914" class="output">Parent commit (@-) : <tspan class="bold fg5">o</tspan><tspan class="fg8">rrkosyo</tspan> <tspan class="bold fg4">7</tspan><tspan class="fg8">fd1a60b</tspan> <tspan class="fg5">master</tspan><tspan class="fg8"> | </tspan><tspan class="fg2">(empty)</tspan> Merge pull request <tspan class="hard-br" rotate="45" dx=".1em" dy="-.2em">↓</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="932" class="output">#6 from Spaceghost/patch-1
|
||||
</tspan><tspan xml:space="preserve" x="10" y="950" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="968" class="output"><tspan class="fg2"># The repo now looks like this:</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="986" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1004" class="output">$ jj log
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1022" class="output"><tspan class="bold fg2">@</tspan> <tspan class="bold fg13">t</tspan><tspan class="bold fg8">soomuvq</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@example.com</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">2024-10-13 19:54:55</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">1</tspan><tspan class="bold fg8">44081d4</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1022" class="output"><tspan class="bold fg2">@</tspan> <tspan class="bold fg13">l</tspan><tspan class="bold fg8">mxvvuro</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@example.com</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">2025-12-20 10:52:43</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">8</tspan><tspan class="bold fg8">fbe3619</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1040" class="output">│ <tspan class="bold fg10">(empty)</tspan><tspan class="bold"> other stuff</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1058" class="output">│ ○ <tspan class="bold fg5">w</tspan><tspan class="fg8">yqozymx</tspan> <tspan class="fg3">jjfan@example.com</tspan> <tspan class="fg6">2024-10-13 19:54:55</tspan> <tspan class="bold fg4">c</tspan><tspan class="fg8">816cafa</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1058" class="output">│ ○ <tspan class="bold fg5">m</tspan><tspan class="fg8">kywokqk</tspan> <tspan class="fg3">jjfan@example.com</tspan> <tspan class="fg6">2025-12-20 10:52:43</tspan> <tspan class="bold fg4">6</tspan><tspan class="fg8">be3d3bd</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1076" class="output">│ │ stuff
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1094" class="output">│ ○ <tspan class="bold fg5">k</tspan><tspan class="fg8">owxouwz</tspan> <tspan class="fg3">octocat@nowhere.com</tspan> <tspan class="fg6">2014-06-10 15:22:26</tspan> <tspan class="fg5">test</tspan> <tspan class="bold fg4">b</tspan><tspan class="fg8">3cbd5bb</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1094" class="output">│ ○ <tspan class="bold fg5">k</tspan><tspan class="fg8">owxouwz</tspan> <tspan class="fg3">octocat@nowhere.com</tspan> <tspan class="fg6">2014-06-10 16:22:26</tspan> <tspan class="fg5">test</tspan> <tspan class="bold fg4">b</tspan><tspan class="fg8">3cbd5bb</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1112" class="output">├─╯ Create CONTRIBUTING.md
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1130" class="output"><tspan class="bold fg14">◆</tspan> <tspan class="bold fg5">o</tspan><tspan class="fg8">rrkosyo</tspan> <tspan class="fg3">octocat@nowhere.com</tspan> <tspan class="fg6">2012-03-06 16:06:50</tspan> <tspan class="fg5">master</tspan> <tspan class="bold fg4">7</tspan><tspan class="fg8">fd1a60b</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1130" class="output"><tspan class="bold fg14">◆</tspan> <tspan class="bold fg5">o</tspan><tspan class="fg8">rrkosyo</tspan> <tspan class="fg3">octocat@nowhere.com</tspan> <tspan class="fg6">2012-03-06 17:06:50</tspan> <tspan class="fg5">master</tspan> <tspan class="bold fg4">7</tspan><tspan class="fg8">fd1a60b</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1148" class="output">│ <tspan class="fg2">(empty)</tspan> Merge pull request #6 from Spaceghost/patch-1
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1166" class="output">~
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1184" class="output">
|
||||
|
|
@ -105,70 +105,70 @@
|
|||
</tspan><tspan xml:space="preserve" x="10" y="1220" class="output"><tspan class="fg2"># is:</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1238" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1256" class="output">$ jj op log --limit 4
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1274" class="output"><tspan class="bold fg2">@</tspan> <tspan class="bold fg12">9c3febcd07fe</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@jujube</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">now, lasted 13 milliseconds</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1292" class="output">│ <tspan class="bold">describe commit aa67e54144e120ceb06055d47ac770f5bd7505f3</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1310" class="output">│ <tspan class="bold fg5">args: jj describe -m 'other stuff'</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1328" class="output">○ <tspan class="fg4">73eed4a6c928</tspan> <tspan class="fg3">jjfan@jujube</tspan> <tspan class="fg6">now, lasted 14 milliseconds</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1274" class="output"><tspan class="bold fg2">@</tspan> <tspan class="bold fg12">6fe860505124</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@jujube</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">now, lasted 2 milliseconds</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1292" class="output">│ <tspan class="bold">describe commit e23df82b798f95dce25d6afe927ef96740fcaccc</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1310" class="output">│ <tspan class="bold fg13">args: jj describe -m 'other stuff'</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1328" class="output">○ <tspan class="fg4">e5fb5129190e</tspan> <tspan class="fg3">jjfan@jujube</tspan> <tspan class="fg6">now, lasted 3 milliseconds</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1346" class="output">│ new empty commit
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1364" class="output">│ <tspan class="fg5">args: jj new master</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1382" class="output">○ <tspan class="fg4">78f44786ada8</tspan> <tspan class="fg3">jjfan@jujube</tspan> <tspan class="fg6">now, lasted 14 milliseconds</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1400" class="output">│ rebase commit ae764306f7544e76e049d0a271449fa986e22de9 and descendants
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1418" class="output">│ <tspan class="fg5">args: jj rebase -d test</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1436" class="output">○ <tspan class="fg4">95902a54354d</tspan> <tspan class="fg3">jjfan@jujube</tspan> <tspan class="fg6">now, lasted 2 milliseconds</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1454" class="output">│ describe commit 8756f29849ccaf0024ff98c0605bbb1289c2992f
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1382" class="output">○ <tspan class="fg4">4fad9005482f</tspan> <tspan class="fg3">jjfan@jujube</tspan> <tspan class="fg6">now, lasted 3 milliseconds</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1400" class="output">│ rebase commit bc757fe50896175ba63cc04c0652705700e62f07 and descendants
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1418" class="output">│ <tspan class="fg5">args: jj rebase --onto test</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1436" class="output">○ <tspan class="fg4">ed5688dfcb09</tspan> <tspan class="fg3">jjfan@jujube</tspan> <tspan class="fg6">now, lasted 2 milliseconds</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1454" class="output">│ describe commit f55bbc6b6c0611320513479726a0a25da00b78a5
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1472" class="output">│ <tspan class="fg5">args: jj describe -m stuff</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1490" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1508" class="output"><tspan class="fg2"># Let's revert that rebase operation:</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1526" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1544" class="output">$ jj op revert 78f44
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1562" class="output">Reverted operation: <tspan class="fg4">78f44786ada8</tspan> (<tspan class="fg6">2024-10-13 19:54:55</tspan>) rebase commit ae764306f7544e<tspan class="hard-br" rotate="45" dx=".1em" dy="-.2em">↓</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1580" class="output">76e049d0a271449fa986e22de9 and descendants
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1544" class="output">$ jj op revert 4fad9
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1562" class="output">Reverted operation: <tspan class="fg4">4fad9005482f</tspan> (<tspan class="fg6">2025-12-20 10:52:43</tspan>) rebase commit bc757fe5089<tspan class="hard-br" rotate="45" dx=".1em" dy="-.2em">↓</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1580" class="output">6175ba63cc04c0652705700e62f07 and descendants
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1598" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1616" class="output"><tspan class="fg2"># Note that only the rebase was reverted, and the</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1634" class="output"><tspan class="fg2"># subsequent "other stuff" change was not:</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1634" class="output"><tspan class="fg2"># subsequent "other stuff" change was not reverted:</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1652" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1670" class="output">$ jj log
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1688" class="output"><tspan class="bold fg2">@</tspan> <tspan class="bold fg13">t</tspan><tspan class="bold fg8">soomuvq</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@example.com</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">2024-10-13 19:54:55</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">1</tspan><tspan class="bold fg8">44081d4</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1688" class="output"><tspan class="bold fg2">@</tspan> <tspan class="bold fg13">l</tspan><tspan class="bold fg8">mxvvuro</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@example.com</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">2025-12-20 10:52:43</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">8</tspan><tspan class="bold fg8">fbe3619</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1706" class="output">│ <tspan class="bold fg10">(empty)</tspan><tspan class="bold"> other stuff</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1724" class="output">│ ○ <tspan class="bold fg5">w</tspan><tspan class="fg8">yqozymx</tspan> <tspan class="fg3">jjfan@example.com</tspan> <tspan class="fg6">2024-10-13 19:54:55</tspan> <tspan class="bold fg4">a</tspan><tspan class="fg8">e764306</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1724" class="output">│ ○ <tspan class="bold fg5">m</tspan><tspan class="fg8">kywokqk</tspan> <tspan class="fg3">jjfan@example.com</tspan> <tspan class="fg6">2025-12-20 10:52:43</tspan> <tspan class="bold fg4">bc</tspan><tspan class="fg8">757fe5</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1742" class="output">├─╯ stuff
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1760" class="output">│ ○ <tspan class="bold fg5">k</tspan><tspan class="fg8">owxouwz</tspan> <tspan class="fg3">octocat@nowhere.com</tspan> <tspan class="fg6">2014-06-10 15:22:26</tspan> <tspan class="fg5">test</tspan> <tspan class="bold fg4">b</tspan><tspan class="fg8">3cbd5bb</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1760" class="output">│ ○ <tspan class="bold fg5">k</tspan><tspan class="fg8">owxouwz</tspan> <tspan class="fg3">octocat@nowhere.com</tspan> <tspan class="fg6">2014-06-10 16:22:26</tspan> <tspan class="fg5">test</tspan> <tspan class="bold fg4">b3</tspan><tspan class="fg8">cbd5bb</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1778" class="output">├─╯ Create CONTRIBUTING.md
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1796" class="output"><tspan class="bold fg14">◆</tspan> <tspan class="bold fg5">o</tspan><tspan class="fg8">rrkosyo</tspan> <tspan class="fg3">octocat@nowhere.com</tspan> <tspan class="fg6">2012-03-06 16:06:50</tspan> <tspan class="fg5">master</tspan> <tspan class="bold fg4">7</tspan><tspan class="fg8">fd1a60b</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1796" class="output"><tspan class="bold fg14">◆</tspan> <tspan class="bold fg5">o</tspan><tspan class="fg8">rrkosyo</tspan> <tspan class="fg3">octocat@nowhere.com</tspan> <tspan class="fg6">2012-03-06 17:06:50</tspan> <tspan class="fg5">master</tspan> <tspan class="bold fg4">7</tspan><tspan class="fg8">fd1a60b</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1814" class="output">│ <tspan class="fg2">(empty)</tspan> Merge pull request #6 from Spaceghost/patch-1
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1832" class="output">~
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1850" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1868" class="output"><tspan class="fg2"># We can also see what the repo looked like</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1886" class="output"><tspan class="fg2"># after the rebase operation:</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1904" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1922" class="output">$ jj --at-op 78f44 log
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1940" class="output"><tspan class="bold fg2">@</tspan> <tspan class="bold fg13">w</tspan><tspan class="bold fg8">yqozymx</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@example.com</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">2024-10-13 19:54:55</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">c</tspan><tspan class="bold fg8">816cafa</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1922" class="output">$ jj --at-op 4fad9 log
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1940" class="output"><tspan class="bold fg2">@</tspan> <tspan class="bold fg13">m</tspan><tspan class="bold fg8">kywokqk</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@example.com</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">2025-12-20 10:52:43</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">6</tspan><tspan class="bold fg8">be3d3bd</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1958" class="output">│ <tspan class="bold">stuff</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1976" class="output">○ <tspan class="bold fg5">k</tspan><tspan class="fg8">owxouwz</tspan> <tspan class="fg3">octocat@nowhere.com</tspan> <tspan class="fg6">2014-06-10 15:22:26</tspan> <tspan class="fg5">test</tspan> <tspan class="bold fg4">b</tspan><tspan class="fg8">3cbd5bb</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1976" class="output">○ <tspan class="bold fg5">k</tspan><tspan class="fg8">owxouwz</tspan> <tspan class="fg3">octocat@nowhere.com</tspan> <tspan class="fg6">2014-06-10 16:22:26</tspan> <tspan class="fg5">test</tspan> <tspan class="bold fg4">b</tspan><tspan class="fg8">3cbd5bb</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1994" class="output">│ Create CONTRIBUTING.md
|
||||
</tspan><tspan xml:space="preserve" x="10" y="2012" class="output"><tspan class="bold fg14">◆</tspan> <tspan class="bold fg5">o</tspan><tspan class="fg8">rrkosyo</tspan> <tspan class="fg3">octocat@nowhere.com</tspan> <tspan class="fg6">2012-03-06 16:06:50</tspan> <tspan class="fg5">master</tspan> <tspan class="bold fg4">7</tspan><tspan class="fg8">fd1a60b</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="2012" class="output"><tspan class="bold fg14">◆</tspan> <tspan class="bold fg5">o</tspan><tspan class="fg8">rrkosyo</tspan> <tspan class="fg3">octocat@nowhere.com</tspan> <tspan class="fg6">2012-03-06 17:06:50</tspan> <tspan class="fg5">master</tspan> <tspan class="bold fg4">7</tspan><tspan class="fg8">fd1a60b</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="2030" class="output">│ <tspan class="fg2">(empty)</tspan> Merge pull request #6 from Spaceghost/patch-1
|
||||
</tspan><tspan xml:space="preserve" x="10" y="2048" class="output">~
|
||||
</tspan><tspan xml:space="preserve" x="10" y="2066" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="2084" class="output"><tspan class="fg2"># Let's say we instead want to go back to the</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="2102" class="output"><tspan class="fg2"># state of the repo right after the rebase:</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="2120" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="2138" class="output">$ jj op restore 78f44
|
||||
</tspan><tspan xml:space="preserve" x="10" y="2156" class="output">Restored to operation: <tspan class="fg4">78f44786ada8</tspan> (<tspan class="fg6">2024-10-13 19:54:55</tspan>) rebase commit ae764306<tspan class="hard-br" rotate="45" dx=".1em" dy="-.2em">↓</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="2174" class="output">f7544e76e049d0a271449fa986e22de9 and descendants
|
||||
</tspan><tspan xml:space="preserve" x="10" y="2192" class="output">Working copy now at: <tspan class="bold fg13">w</tspan><tspan class="bold fg8">yqozymx</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">c</tspan><tspan class="bold fg8">816cafa</tspan><tspan class="bold"> stuff</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="2210" class="output">Parent commit : <tspan class="bold fg5">k</tspan><tspan class="fg8">owxouwz</tspan> <tspan class="bold fg4">b</tspan><tspan class="fg8">3cbd5bb</tspan> <tspan class="fg5">test</tspan><tspan class="fg8"> | </tspan>Create CONTRIBUTING.md
|
||||
</tspan><tspan xml:space="preserve" x="10" y="2138" class="output">$ jj op restore 4fad9
|
||||
</tspan><tspan xml:space="preserve" x="10" y="2156" class="output">Restored to operation: <tspan class="fg4">4fad9005482f</tspan> (<tspan class="fg6">2025-12-20 10:52:43</tspan>) rebase commit bc757fe5<tspan class="hard-br" rotate="45" dx=".1em" dy="-.2em">↓</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="2174" class="output">0896175ba63cc04c0652705700e62f07 and descendants
|
||||
</tspan><tspan xml:space="preserve" x="10" y="2192" class="output">Working copy (@) now at: <tspan class="bold fg13">m</tspan><tspan class="bold fg8">kywokqk</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">6</tspan><tspan class="bold fg8">be3d3bd</tspan><tspan class="bold"> stuff</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="2210" class="output">Parent commit (@-) : <tspan class="bold fg5">k</tspan><tspan class="fg8">owxouwz</tspan> <tspan class="bold fg4">b</tspan><tspan class="fg8">3cbd5bb</tspan> <tspan class="fg5">test</tspan><tspan class="fg8"> | </tspan>Create CONTRIBUTING.md
|
||||
</tspan><tspan xml:space="preserve" x="10" y="2228" class="output">Added 2 files, modified 0 files, removed 0 files
|
||||
</tspan><tspan xml:space="preserve" x="10" y="2246" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="2264" class="output"><tspan class="fg2"># We're now back to before the "other stuff"</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="2282" class="output"><tspan class="fg2"># change existed:</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="2300" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="2318" class="output">$ jj log
|
||||
</tspan><tspan xml:space="preserve" x="10" y="2336" class="output"><tspan class="bold fg2">@</tspan> <tspan class="bold fg13">w</tspan><tspan class="bold fg8">yqozymx</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@example.com</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">2024-10-13 19:54:55</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">c</tspan><tspan class="bold fg8">816cafa</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="2336" class="output"><tspan class="bold fg2">@</tspan> <tspan class="bold fg13">m</tspan><tspan class="bold fg8">kywokqk</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@example.com</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">2025-12-20 10:52:43</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">6</tspan><tspan class="bold fg8">be3d3bd</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="2354" class="output">│ <tspan class="bold">stuff</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="2372" class="output">○ <tspan class="bold fg5">k</tspan><tspan class="fg8">owxouwz</tspan> <tspan class="fg3">octocat@nowhere.com</tspan> <tspan class="fg6">2014-06-10 15:22:26</tspan> <tspan class="fg5">test</tspan> <tspan class="bold fg4">b</tspan><tspan class="fg8">3cbd5bb</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="2372" class="output">○ <tspan class="bold fg5">k</tspan><tspan class="fg8">owxouwz</tspan> <tspan class="fg3">octocat@nowhere.com</tspan> <tspan class="fg6">2014-06-10 16:22:26</tspan> <tspan class="fg5">test</tspan> <tspan class="bold fg4">b</tspan><tspan class="fg8">3cbd5bb</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="2390" class="output">│ Create CONTRIBUTING.md
|
||||
</tspan><tspan xml:space="preserve" x="10" y="2408" class="output"><tspan class="bold fg14">◆</tspan> <tspan class="bold fg5">o</tspan><tspan class="fg8">rrkosyo</tspan> <tspan class="fg3">octocat@nowhere.com</tspan> <tspan class="fg6">2012-03-06 16:06:50</tspan> <tspan class="fg5">master</tspan> <tspan class="bold fg4">7</tspan><tspan class="fg8">fd1a60b</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="2408" class="output"><tspan class="bold fg14">◆</tspan> <tspan class="bold fg5">o</tspan><tspan class="fg8">rrkosyo</tspan> <tspan class="fg3">octocat@nowhere.com</tspan> <tspan class="fg6">2012-03-06 17:06:50</tspan> <tspan class="fg5">master</tspan> <tspan class="bold fg4">7</tspan><tspan class="fg8">fd1a60b</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="2426" class="output">│ <tspan class="fg2">(empty)</tspan> Merge pull request #6 from Spaceghost/patch-1
|
||||
</tspan><tspan xml:space="preserve" x="10" y="2444" class="output">~
|
||||
</tspan></text>
|
||||
|
|
|
|||
|
Before Width: | Height: | Size: 24 KiB After Width: | Height: | Size: 24 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 71 KiB After Width: | Height: | Size: 79 KiB |
|
|
@ -1,5 +1,5 @@
|
|||
<!-- Created with term-transcript v0.3.0 (https://github.com/slowli/term-transcript) -->
|
||||
<svg viewBox="0 0 720 1658" width="720" height="1658" xmlns="http://www.w3.org/2000/svg">
|
||||
<!-- Created with term-transcript v0.4.0 (https://github.com/slowli/term-transcript) -->
|
||||
<svg viewBox="0 0 720 1712" width="720" height="1712" xmlns="http://www.w3.org/2000/svg">
|
||||
<style>
|
||||
.container {
|
||||
font: 14px Fira Code, Liberation Mono, SFMono-Regular, Consolas, Menlo, monospace;
|
||||
|
|
@ -33,16 +33,16 @@
|
|||
.fg15 { fill: #f2f2f2; } .output-bg .fg15 { stroke: #f2f2f2; }
|
||||
</style>
|
||||
<rect width="100%" height="100%" y="0" rx="4.5" style="fill: #0c0c0c;" />
|
||||
<svg x="0" y="10" width="720" height="1638" viewBox="0 0 720 1638">
|
||||
<svg x="0" y="10" width="720" height="1692" viewBox="0 0 720 1692">
|
||||
<g class="input-bg"></g>
|
||||
<text class="container fg7"><tspan xml:space="preserve" x="10" y="14" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="32" class="output"><tspan class="fg2"># We are on the master branch of the octocat/Hello-World repo,</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="50" class="output"><tspan class="fg2"># represented by the "master" bookmark on the parent commit.</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="68" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="86" class="output">$ jj log
|
||||
</tspan><tspan xml:space="preserve" x="10" y="104" class="output"><tspan class="bold fg2">@</tspan> <tspan class="bold fg13">t</tspan><tspan class="bold fg8">mnxzsns</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@example.com</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">2024-10-13 19:54:57</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">e</tspan><tspan class="bold fg8">692ad7d</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="104" class="output"><tspan class="bold fg2">@</tspan> <tspan class="bold fg13">s</tspan><tspan class="bold fg8">ytovksv</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@example.com</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">2025-12-20 10:52:45</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">c</tspan><tspan class="bold fg8">56c9c76</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="122" class="output">│ <tspan class="bold fg10">(empty)</tspan><tspan class="bold"> </tspan><tspan class="bold fg10">(no description set)</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="140" class="output"><tspan class="bold fg14">◆</tspan> <tspan class="bold fg5">o</tspan><tspan class="fg8">rrkosyo</tspan> <tspan class="fg3">octocat@nowhere.com</tspan> <tspan class="fg6">2012-03-06 16:06:50</tspan> <tspan class="fg5">master</tspan> <tspan class="bold fg4">7</tspan><tspan class="fg8">fd1a60b</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="140" class="output"><tspan class="bold fg14">◆</tspan> <tspan class="bold fg5">o</tspan><tspan class="fg8">rrkosyo</tspan> <tspan class="fg3">octocat@nowhere.com</tspan> <tspan class="fg6">2012-03-06 17:06:50</tspan> <tspan class="fg5">master</tspan> <tspan class="bold fg4">7</tspan><tspan class="fg8">fd1a60b</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="158" class="output">│ <tspan class="fg2">(empty)</tspan> Merge pull request #6 from Spaceghost/patch-1
|
||||
</tspan><tspan xml:space="preserve" x="10" y="176" class="output">~
|
||||
</tspan><tspan xml:space="preserve" x="10" y="194" class="output">
|
||||
|
|
@ -50,9 +50,9 @@
|
|||
</tspan><tspan xml:space="preserve" x="10" y="230" class="output"><tspan class="fg2"># when we rebase it:</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="248" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="266" class="output">$ jj describe -m "README: say which world"
|
||||
</tspan><tspan xml:space="preserve" x="10" y="284" class="output">Working copy now at: <tspan class="bold fg13">t</tspan><tspan class="bold fg8">mnxzsns</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">c</tspan><tspan class="bold fg8">57f52b0</tspan><tspan class="bold"> </tspan><tspan class="bold fg10">(empty)</tspan><tspan class="bold"> README: say which world</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="302" class="output">Parent commit : <tspan class="bold fg5">o</tspan><tspan class="fg8">rrkosyo</tspan> <tspan class="bold fg4">7</tspan><tspan class="fg8">fd1a60b</tspan> <tspan class="fg5">master</tspan><tspan class="fg8"> | </tspan><tspan class="fg2">(empty)</tspan> Merge pull request #6 fr<tspan class="hard-br" rotate="45" dx=".1em" dy="-.2em">↓</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="320" class="output">om Spaceghost/patch-1
|
||||
</tspan><tspan xml:space="preserve" x="10" y="284" class="output">Working copy (@) now at: <tspan class="bold fg13">s</tspan><tspan class="bold fg8">ytovksv</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">4</tspan><tspan class="bold fg8">0e26ed2</tspan><tspan class="bold"> </tspan><tspan class="bold fg10">(empty)</tspan><tspan class="bold"> README: say which world</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="302" class="output">Parent commit (@-) : <tspan class="bold fg5">o</tspan><tspan class="fg8">rrkosyo</tspan> <tspan class="bold fg4">7</tspan><tspan class="fg8">fd1a60b</tspan> <tspan class="fg5">master</tspan><tspan class="fg8"> | </tspan><tspan class="fg2">(empty)</tspan> Merge pull request <tspan class="hard-br" rotate="45" dx=".1em" dy="-.2em">↓</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="320" class="output">#6 from Spaceghost/patch-1
|
||||
</tspan><tspan xml:space="preserve" x="10" y="338" class="output">$ echo "Hello Earth!" > README
|
||||
</tspan><tspan xml:space="preserve" x="10" y="356" class="output">$ jj diff
|
||||
</tspan><tspan xml:space="preserve" x="10" y="374" class="output"><tspan class="fg3">Modified regular file README:</tspan>
|
||||
|
|
@ -67,65 +67,68 @@
|
|||
</tspan><tspan xml:space="preserve" x="10" y="536" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="554" class="output"><tspan class="fg2"># Now rebase:</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="572" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="590" class="output">$ jj rebase -d b1
|
||||
</tspan><tspan xml:space="preserve" x="10" y="608" class="output">Rebased 1 commits
|
||||
</tspan><tspan xml:space="preserve" x="10" y="626" class="output">Working copy now at: <tspan class="bold fg13">tm</tspan><tspan class="bold fg8">nxzsns</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">0</tspan><tspan class="bold fg8">23f3c51</tspan><tspan class="bold"> </tspan><tspan class="bold fg9">(conflict)</tspan><tspan class="bold"> README: say which world</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="644" class="output">Parent commit : <tspan class="bold fg5">tp</tspan><tspan class="fg8">stlust</tspan> <tspan class="bold fg4">b</tspan><tspan class="fg8">1b3f972</tspan> <tspan class="fg5">octocat-patch-1@origin</tspan><tspan class="fg8"> | </tspan>sentence case
|
||||
</tspan><tspan xml:space="preserve" x="10" y="662" class="output">Added 0 files, modified 1 files, removed 0 files
|
||||
</tspan><tspan xml:space="preserve" x="10" y="680" class="output">There are unresolved conflicts at these paths:
|
||||
</tspan><tspan xml:space="preserve" x="10" y="698" class="output">README <tspan class="fg3">2-sided conflict</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="716" class="output">New conflicts appeared in these commits:
|
||||
</tspan><tspan xml:space="preserve" x="10" y="734" class="output"> <tspan class="bold fg5">tm</tspan><tspan class="fg8">nxzsns</tspan> <tspan class="bold fg4">0</tspan><tspan class="fg8">23f3c51</tspan> <tspan class="fg1">(conflict)</tspan> README: say which world
|
||||
</tspan><tspan xml:space="preserve" x="10" y="752" class="output">To resolve the conflicts, start by updating to it:
|
||||
</tspan><tspan xml:space="preserve" x="10" y="770" class="output"> jj new <tspan class="bold fg5">tm</tspan><tspan class="fg8">nxzsns</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="788" class="output">Then use `jj resolve`, or edit the conflict markers in the file directly.
|
||||
</tspan><tspan xml:space="preserve" x="10" y="806" class="output">Once the conflicts are resolved, you may want to inspect the result with `jj dif<tspan class="hard-br" rotate="45" dx=".1em" dy="-.2em">↓</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="824" class="output">f`.
|
||||
</tspan><tspan xml:space="preserve" x="10" y="842" class="output">Then run `jj squash` to move the resolution into the conflicted commit.
|
||||
</tspan><tspan xml:space="preserve" x="10" y="860" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="878" class="output"><tspan class="fg2"># That seemed to succeed but we are also told there is now a conflict.</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="896" class="output"><tspan class="fg2"># Let's take a look at the repo:</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="914" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="932" class="output">$ jj log
|
||||
</tspan><tspan xml:space="preserve" x="10" y="950" class="output"><tspan class="bold fg9">@</tspan> <tspan class="bold fg13">tm</tspan><tspan class="bold fg8">nxzsns</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@example.com</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">2024-10-13 19:54:57</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">0</tspan><tspan class="bold fg8">23f3c51</tspan><tspan class="bold"> </tspan><tspan class="bold fg9">conflict</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="968" class="output">│ <tspan class="bold">README: say which world</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="986" class="output"><tspan class="bold fg14">◆</tspan> <tspan class="bold fg5">tp</tspan><tspan class="fg8">stlust</tspan> <tspan class="fg3">support+octocat@github.com</tspan> <tspan class="fg6">2018-05-10 10:55:19</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1004" class="output">│ <tspan class="fg5">octocat-patch-1@origin</tspan> <tspan class="bold fg4">b</tspan><tspan class="fg8">1b3f972</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1022" class="output">│ sentence case
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1040" class="output"><tspan class="bold fg14">◆</tspan> <tspan class="bold fg5">o</tspan><tspan class="fg8">rrkosyo</tspan> <tspan class="fg3">octocat@nowhere.com</tspan> <tspan class="fg6">2012-03-06 16:06:50</tspan> <tspan class="fg5">master</tspan> <tspan class="bold fg4">7</tspan><tspan class="fg8">fd1a60b</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1058" class="output">│ <tspan class="fg2">(empty)</tspan> Merge pull request #6 from Spaceghost/patch-1
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1076" class="output">~
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1094" class="output">$ jj status
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1112" class="output">Working copy changes:
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1130" class="output"><tspan class="fg6">M README</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1148" class="output"><tspan class="fg1">There are unresolved conflicts at these paths:</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1166" class="output">README <tspan class="fg3">2-sided conflict</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1184" class="output">Working copy : <tspan class="bold fg13">tm</tspan><tspan class="bold fg8">nxzsns</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">0</tspan><tspan class="bold fg8">23f3c51</tspan><tspan class="bold"> </tspan><tspan class="bold fg9">(conflict)</tspan><tspan class="bold"> README: say which world</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1202" class="output">Parent commit: <tspan class="bold fg5">tp</tspan><tspan class="fg8">stlust</tspan> <tspan class="bold fg4">b</tspan><tspan class="fg8">1b3f972</tspan> <tspan class="fg5">octocat-patch-1@origin</tspan><tspan class="fg8"> | </tspan>sentence case
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1220" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1238" class="output"><tspan class="fg2"># Indeed, the rebased commit has a conflict. The conflicted file</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1256" class="output"><tspan class="fg2"># in the working copy looks like this:</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1274" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1292" class="output">$ cat README
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1310" class="output"><<<<<<< Conflict 1 of 1
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1328" class="output">%%%%%%% Changes from base to side #1
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1346" class="output">-Hello World!
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1364" class="output">+Hello world!
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1382" class="output">+++++++ Contents of side #2
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1400" class="output">Hello Earth!
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1418" class="output">>>>>>>> Conflict 1 of 1 ends
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1436" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1454" class="output"><tspan class="fg2"># Now we will resolve the conflict:</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1472" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1490" class="output">$ echo "Hello earth!" > README
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1508" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1526" class="output"><tspan class="fg2"># The status command no longer reports it:</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1544" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1562" class="output">$ jj status
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1580" class="output">Working copy changes:
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1598" class="output"><tspan class="fg6">M README</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1616" class="output">Working copy : <tspan class="bold fg13">tm</tspan><tspan class="bold fg8">nxzsns</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">3</tspan><tspan class="bold fg8">da30911</tspan><tspan class="bold"> README: say which world</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1634" class="output">Parent commit: <tspan class="bold fg5">tp</tspan><tspan class="fg8">stlust</tspan> <tspan class="bold fg4">b</tspan><tspan class="fg8">1b3f972</tspan> <tspan class="fg5">octocat-patch-1@origin</tspan><tspan class="fg8"> | </tspan>sentence case
|
||||
</tspan><tspan xml:space="preserve" x="10" y="590" class="output">$ jj rebase --onto b1
|
||||
</tspan><tspan xml:space="preserve" x="10" y="608" class="output">Rebased 1 commits to destination
|
||||
</tspan><tspan xml:space="preserve" x="10" y="626" class="output">Working copy (@) now at: <tspan class="bold fg13">s</tspan><tspan class="bold fg8">ytovksv</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">d</tspan><tspan class="bold fg8">749f736</tspan><tspan class="bold"> </tspan><tspan class="bold fg9">(conflict)</tspan><tspan class="bold"> README: say which world</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="644" class="output">Parent commit (@-) : <tspan class="bold fg5">t</tspan><tspan class="fg8">pstlust</tspan> <tspan class="bold fg4">b</tspan><tspan class="fg8">1b3f972</tspan> <tspan class="fg5">octocat-patch-1@origin</tspan><tspan class="fg8"> | </tspan>sentence ca<tspan class="hard-br" rotate="45" dx=".1em" dy="-.2em">↓</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="662" class="output">se
|
||||
</tspan><tspan xml:space="preserve" x="10" y="680" class="output">Added 0 files, modified 1 files, removed 0 files
|
||||
</tspan><tspan xml:space="preserve" x="10" y="698" class="output"><tspan class="bold fg3">Warning: </tspan><tspan class="bold">There are unresolved conflicts at these paths:</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="716" class="output">README <tspan class="fg3">2-sided conflict</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="734" class="output">New conflicts appeared in 1 commits:
|
||||
</tspan><tspan xml:space="preserve" x="10" y="752" class="output"> <tspan class="bold fg13">s</tspan><tspan class="bold fg8">ytovksv</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">d</tspan><tspan class="bold fg8">749f736</tspan><tspan class="bold"> </tspan><tspan class="bold fg9">(conflict)</tspan><tspan class="bold"> README: say which world</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="770" class="output"><tspan class="bold fg6">Hint: </tspan>To resolve the conflicts, start by creating a commit on top of
|
||||
</tspan><tspan xml:space="preserve" x="10" y="788" class="output">the conflicted commit:
|
||||
</tspan><tspan xml:space="preserve" x="10" y="806" class="output"> jj new <tspan class="bold fg5">s</tspan><tspan class="fg8">ytovksv</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="824" class="output">Then use `jj resolve`, or edit the conflict markers in the file directly.
|
||||
</tspan><tspan xml:space="preserve" x="10" y="842" class="output">Once the conflicts are resolved, you can inspect the result with `jj diff`.
|
||||
</tspan><tspan xml:space="preserve" x="10" y="860" class="output">Then run `jj squash` to move the resolution into the conflicted commit.
|
||||
</tspan><tspan xml:space="preserve" x="10" y="878" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="896" class="output"><tspan class="fg2"># That seemed to succeed but we are also told there is now a conflict.</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="914" class="output"><tspan class="fg2"># Let's take a look at the repo:</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="932" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="950" class="output">$ jj log
|
||||
</tspan><tspan xml:space="preserve" x="10" y="968" class="output"><tspan class="bold fg1">@</tspan> <tspan class="bold fg13">s</tspan><tspan class="bold fg8">ytovksv</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@example.com</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">2025-12-20 10:52:45</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">d</tspan><tspan class="bold fg8">749f736</tspan><tspan class="bold"> </tspan><tspan class="bold fg9">conflict</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="986" class="output">│ <tspan class="bold">README: say which world</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1004" class="output"><tspan class="bold fg14">◆</tspan> <tspan class="bold fg5">t</tspan><tspan class="fg8">pstlust</tspan> <tspan class="fg3">support+octocat@github.com</tspan> <tspan class="fg6">2018-05-10 11:55:19</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1022" class="output">│ <tspan class="fg5">octocat-patch-1@origin</tspan> <tspan class="bold fg4">b</tspan><tspan class="fg8">1b3f972</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1040" class="output">│ sentence case
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1058" class="output"><tspan class="bold fg14">◆</tspan> <tspan class="bold fg5">o</tspan><tspan class="fg8">rrkosyo</tspan> <tspan class="fg3">octocat@nowhere.com</tspan> <tspan class="fg6">2012-03-06 17:06:50</tspan> <tspan class="fg5">master</tspan> <tspan class="bold fg4">7</tspan><tspan class="fg8">fd1a60b</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1076" class="output">│ <tspan class="fg2">(empty)</tspan> Merge pull request #6 from Spaceghost/patch-1
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1094" class="output">~
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1112" class="output">$ jj status
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1130" class="output">Working copy changes:
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1148" class="output"><tspan class="fg6">M README</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1166" class="output">Working copy (@) : <tspan class="bold fg13">s</tspan><tspan class="bold fg8">ytovksv</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">d</tspan><tspan class="bold fg8">749f736</tspan><tspan class="bold"> </tspan><tspan class="bold fg9">(conflict)</tspan><tspan class="bold"> README: say which world</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1184" class="output">Parent commit (@-): <tspan class="bold fg5">t</tspan><tspan class="fg8">pstlust</tspan> <tspan class="bold fg4">b</tspan><tspan class="fg8">1b3f972</tspan> <tspan class="fg5">octocat-patch-1@origin</tspan><tspan class="fg8"> | </tspan>sentence case
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1202" class="output"><tspan class="bold fg3">Warning: </tspan><tspan class="bold">There are unresolved conflicts at these paths:</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1220" class="output">README <tspan class="fg3">2-sided conflict</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1238" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1256" class="output"><tspan class="fg2"># Indeed, the rebased commit has a conflict. The conflicted file</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1274" class="output"><tspan class="fg2"># in the working copy looks like this:</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1292" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1310" class="output">$ cat README
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1328" class="output"><<<<<<< conflict 1 of 1
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1346" class="output">%%%%%%% diff from: orrkosyo 7fd1a60b "Merge pull request #6 from Spaceghost/patc<tspan class="hard-br" rotate="45" dx=".1em" dy="-.2em">↓</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1364" class="output">h-1" (parents of rebased commit)
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1382" class="output">\\\\\\\ to: tpstlust b1b3f972 "sentence case" (rebase destination)
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1400" class="output">-Hello World!
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1418" class="output">+Hello world!
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1436" class="output">+++++++ sytovksv 9fa36e3d "README: say which world" (rebased commit)
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1454" class="output">Hello Earth!
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1472" class="output">>>>>>>> conflict 1 of 1 ends
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1490" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1508" class="output"><tspan class="fg2"># Now we will resolve the conflict:</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1526" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1544" class="output">$ echo "Hello earth!" > README
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1562" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1580" class="output"><tspan class="fg2"># The status command no longer reports it:</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1598" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1616" class="output">$ jj status
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1634" class="output">Working copy changes:
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1652" class="output"><tspan class="fg6">M README</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1670" class="output">Working copy (@) : <tspan class="bold fg13">s</tspan><tspan class="bold fg8">ytovksv</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">7fe</tspan><tspan class="bold fg8">f32fb</tspan><tspan class="bold"> README: say which world</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1688" class="output">Parent commit (@-): <tspan class="bold fg5">t</tspan><tspan class="fg8">pstlust</tspan> <tspan class="bold fg4">b</tspan><tspan class="fg8">1b3f972</tspan> <tspan class="fg5">octocat-patch-1@origin</tspan><tspan class="fg8"> | </tspan>sentence case
|
||||
</tspan></text>
|
||||
</svg>
|
||||
</svg>
|
||||
|
|
|
|||
|
Before Width: | Height: | Size: 15 KiB After Width: | Height: | Size: 16 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 84 KiB After Width: | Height: | Size: 86 KiB |
|
|
@ -1,4 +1,4 @@
|
|||
<!-- Created with term-transcript v0.3.0 (https://github.com/slowli/term-transcript) -->
|
||||
<!-- Created with term-transcript v0.4.0 (https://github.com/slowli/term-transcript) -->
|
||||
<svg viewBox="0 0 720 1892" width="720" height="1892" xmlns="http://www.w3.org/2000/svg">
|
||||
<style>
|
||||
.container {
|
||||
|
|
@ -40,16 +40,16 @@
|
|||
</tspan><tspan xml:space="preserve" x="10" y="50" class="output"><tspan class="fg2"># We have an empty working copy on top of master:</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="68" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="86" class="output">$ jj log
|
||||
</tspan><tspan xml:space="preserve" x="10" y="104" class="output"><tspan class="bold fg2">@</tspan> <tspan class="bold fg13">s</tspan><tspan class="bold fg8">qmuzyqk</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@example.com</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">2024-10-13 19:54:59</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">2</tspan><tspan class="bold fg8">c379c44</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="104" class="output"><tspan class="bold fg2">@</tspan> <tspan class="bold fg13">u</tspan><tspan class="bold fg8">trvlvoq</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@example.com</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">2025-12-20 10:52:46</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">d</tspan><tspan class="bold fg8">d72678b</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="122" class="output">│ <tspan class="bold fg10">(empty)</tspan><tspan class="bold"> </tspan><tspan class="bold fg10">(no description set)</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="140" class="output"><tspan class="bold fg14">◆</tspan> <tspan class="bold fg5">o</tspan><tspan class="fg8">rrkosyo</tspan> <tspan class="fg3">octocat@nowhere.com</tspan> <tspan class="fg6">2012-03-06 16:06:50</tspan> <tspan class="fg5">master</tspan> <tspan class="bold fg4">7</tspan><tspan class="fg8">fd1a60b</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="140" class="output"><tspan class="bold fg14">◆</tspan> <tspan class="bold fg5">o</tspan><tspan class="fg8">rrkosyo</tspan> <tspan class="fg3">octocat@nowhere.com</tspan> <tspan class="fg6">2012-03-06 17:06:50</tspan> <tspan class="fg5">master</tspan> <tspan class="bold fg4">7</tspan><tspan class="fg8">fd1a60b</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="158" class="output">│ <tspan class="fg2">(empty)</tspan> Merge pull request #6 from Spaceghost/patch-1
|
||||
</tspan><tspan xml:space="preserve" x="10" y="176" class="output">~
|
||||
</tspan><tspan xml:space="preserve" x="10" y="194" class="output">$ jj status
|
||||
</tspan><tspan xml:space="preserve" x="10" y="212" class="output">The working copy is clean
|
||||
</tspan><tspan xml:space="preserve" x="10" y="230" class="output">Working copy : <tspan class="bold fg13">s</tspan><tspan class="bold fg8">qmuzyqk</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">2</tspan><tspan class="bold fg8">c379c44</tspan><tspan class="bold"> </tspan><tspan class="bold fg10">(empty)</tspan><tspan class="bold"> </tspan><tspan class="bold fg10">(no description set)</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="248" class="output">Parent commit: <tspan class="bold fg5">o</tspan><tspan class="fg8">rrkosyo</tspan> <tspan class="bold fg4">7</tspan><tspan class="fg8">fd1a60b</tspan> <tspan class="fg5">master</tspan><tspan class="fg8"> | </tspan><tspan class="fg2">(empty)</tspan> Merge pull request #6 from Spa<tspan class="hard-br" rotate="45" dx=".1em" dy="-.2em">↓</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="266" class="output">ceghost/patch-1
|
||||
</tspan><tspan xml:space="preserve" x="10" y="212" class="output">The working copy has no changes.
|
||||
</tspan><tspan xml:space="preserve" x="10" y="230" class="output">Working copy (@) : <tspan class="bold fg13">u</tspan><tspan class="bold fg8">trvlvoq</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">d</tspan><tspan class="bold fg8">d72678b</tspan><tspan class="bold"> </tspan><tspan class="bold fg10">(empty)</tspan><tspan class="bold"> </tspan><tspan class="bold fg10">(no description set)</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="248" class="output">Parent commit (@-): <tspan class="bold fg5">o</tspan><tspan class="fg8">rrkosyo</tspan> <tspan class="bold fg4">7</tspan><tspan class="fg8">fd1a60b</tspan> <tspan class="fg5">master</tspan><tspan class="fg8"> | </tspan><tspan class="fg2">(empty)</tspan> Merge pull request #6 fro<tspan class="hard-br" rotate="45" dx=".1em" dy="-.2em">↓</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="266" class="output">m Spaceghost/patch-1
|
||||
</tspan><tspan xml:space="preserve" x="10" y="284" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="302" class="output"><tspan class="fg2"># Now make some changes in the working copy:</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="320" class="output">
|
||||
|
|
@ -63,39 +63,39 @@
|
|||
</tspan><tspan xml:space="preserve" x="10" y="464" class="output">Working copy changes:
|
||||
</tspan><tspan xml:space="preserve" x="10" y="482" class="output"><tspan class="fg6">M README</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="500" class="output"><tspan class="fg2">A new-file</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="518" class="output">Working copy : <tspan class="bold fg13">s</tspan><tspan class="bold fg8">qmuzyqk</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">8</tspan><tspan class="bold fg8">a6d28e6</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">(no description set)</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="536" class="output">Parent commit: <tspan class="bold fg5">o</tspan><tspan class="fg8">rrkosyo</tspan> <tspan class="bold fg4">7</tspan><tspan class="fg8">fd1a60b</tspan> <tspan class="fg5">master</tspan><tspan class="fg8"> | </tspan><tspan class="fg2">(empty)</tspan> Merge pull request #6 from Spa<tspan class="hard-br" rotate="45" dx=".1em" dy="-.2em">↓</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="554" class="output">ceghost/patch-1
|
||||
</tspan><tspan xml:space="preserve" x="10" y="518" class="output">Working copy (@) : <tspan class="bold fg13">u</tspan><tspan class="bold fg8">trvlvoq</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">1</tspan><tspan class="bold fg8">6f9208a</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">(no description set)</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="536" class="output">Parent commit (@-): <tspan class="bold fg5">o</tspan><tspan class="fg8">rrkosyo</tspan> <tspan class="bold fg4">7</tspan><tspan class="fg8">fd1a60b</tspan> <tspan class="fg5">master</tspan><tspan class="fg8"> | </tspan><tspan class="fg2">(empty)</tspan> Merge pull request #6 fro<tspan class="hard-br" rotate="45" dx=".1em" dy="-.2em">↓</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="554" class="output">m Spaceghost/patch-1
|
||||
</tspan><tspan xml:space="preserve" x="10" y="572" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="590" class="output"><tspan class="fg2"># Add a bookmark so we can easily refer to this</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="608" class="output"><tspan class="fg2"># commit:</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="626" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="644" class="output">$ jj bookmark create goodbye
|
||||
</tspan><tspan xml:space="preserve" x="10" y="662" class="output">Created 1 bookmarks pointing to <tspan class="bold fg5">s</tspan><tspan class="fg8">qmuzyqk</tspan> <tspan class="bold fg4">8</tspan><tspan class="fg8">a6d28e6</tspan> <tspan class="fg5">goodbye</tspan><tspan class="fg8"> | </tspan><tspan class="fg3">(no description set)</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="662" class="output">Created 1 bookmarks pointing to <tspan class="bold fg13">u</tspan><tspan class="bold fg8">trvlvoq</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">1</tspan><tspan class="bold fg8">6f9208a</tspan><tspan class="bold"> </tspan><tspan class="bold fg13">goodbye</tspan><tspan class="bold fg8"> | </tspan><tspan class="bold fg3">(no description set)</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="680" class="output">$ jj log
|
||||
</tspan><tspan xml:space="preserve" x="10" y="698" class="output"><tspan class="bold fg2">@</tspan> <tspan class="bold fg13">s</tspan><tspan class="bold fg8">qmuzyqk</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@example.com</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">2024-10-13 19:54:59</tspan><tspan class="bold"> </tspan><tspan class="bold fg13">goodbye</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">8</tspan><tspan class="bold fg8">a6d28e6</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="698" class="output"><tspan class="bold fg2">@</tspan> <tspan class="bold fg13">u</tspan><tspan class="bold fg8">trvlvoq</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@example.com</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">2025-12-20 10:52:46</tspan><tspan class="bold"> </tspan><tspan class="bold fg13">goodbye</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">1</tspan><tspan class="bold fg8">6f9208a</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="716" class="output">│ <tspan class="bold fg3">(no description set)</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="734" class="output"><tspan class="bold fg14">◆</tspan> <tspan class="bold fg5">o</tspan><tspan class="fg8">rrkosyo</tspan> <tspan class="fg3">octocat@nowhere.com</tspan> <tspan class="fg6">2012-03-06 16:06:50</tspan> <tspan class="fg5">master</tspan> <tspan class="bold fg4">7</tspan><tspan class="fg8">fd1a60b</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="734" class="output"><tspan class="bold fg14">◆</tspan> <tspan class="bold fg5">o</tspan><tspan class="fg8">rrkosyo</tspan> <tspan class="fg3">octocat@nowhere.com</tspan> <tspan class="fg6">2012-03-06 17:06:50</tspan> <tspan class="fg5">master</tspan> <tspan class="bold fg4">7</tspan><tspan class="fg8">fd1a60b</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="752" class="output">│ <tspan class="fg2">(empty)</tspan> Merge pull request #6 from Spaceghost/patch-1
|
||||
</tspan><tspan xml:space="preserve" x="10" y="770" class="output">~
|
||||
</tspan><tspan xml:space="preserve" x="10" y="788" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="806" class="output"><tspan class="fg2"># Start working on a new change off of master:</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="824" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="842" class="output">$ jj new master
|
||||
</tspan><tspan xml:space="preserve" x="10" y="860" class="output">Working copy now at: <tspan class="bold fg13">l</tspan><tspan class="bold fg8">nmmqryq</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">4</tspan><tspan class="bold fg8">a26dc6e</tspan><tspan class="bold"> </tspan><tspan class="bold fg10">(empty)</tspan><tspan class="bold"> </tspan><tspan class="bold fg10">(no description set)</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="878" class="output">Parent commit : <tspan class="bold fg5">o</tspan><tspan class="fg8">rrkosyo</tspan> <tspan class="bold fg4">7</tspan><tspan class="fg8">fd1a60b</tspan> <tspan class="fg5">master</tspan><tspan class="fg8"> | </tspan><tspan class="fg2">(empty)</tspan> Merge pull request #6 fr<tspan class="hard-br" rotate="45" dx=".1em" dy="-.2em">↓</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="896" class="output">om Spaceghost/patch-1
|
||||
</tspan><tspan xml:space="preserve" x="10" y="860" class="output">Working copy (@) now at: <tspan class="bold fg13">v</tspan><tspan class="bold fg8">yupzrxm</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">c</tspan><tspan class="bold fg8">f155929</tspan><tspan class="bold"> </tspan><tspan class="bold fg10">(empty)</tspan><tspan class="bold"> </tspan><tspan class="bold fg10">(no description set)</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="878" class="output">Parent commit (@-) : <tspan class="bold fg5">o</tspan><tspan class="fg8">rrkosyo</tspan> <tspan class="bold fg4">7</tspan><tspan class="fg8">fd1a60b</tspan> <tspan class="fg5">master</tspan><tspan class="fg8"> | </tspan><tspan class="fg2">(empty)</tspan> Merge pull request <tspan class="hard-br" rotate="45" dx=".1em" dy="-.2em">↓</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="896" class="output">#6 from Spaceghost/patch-1
|
||||
</tspan><tspan xml:space="preserve" x="10" y="914" class="output">Added 0 files, modified 1 files, removed 1 files
|
||||
</tspan><tspan xml:space="preserve" x="10" y="932" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="950" class="output"><tspan class="fg2"># Note that we were told the working copy is now empty (AKA clean). The</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="968" class="output"><tspan class="fg2"># "goodbye" change stayed in its own commit:</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="986" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1004" class="output">$ jj log
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1022" class="output"><tspan class="bold fg2">@</tspan> <tspan class="bold fg13">l</tspan><tspan class="bold fg8">nmmqryq</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@example.com</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">2024-10-13 19:54:58</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">4</tspan><tspan class="bold fg8">a26dc6e</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1022" class="output"><tspan class="bold fg2">@</tspan> <tspan class="bold fg13">v</tspan><tspan class="bold fg8">yupzrxm</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@example.com</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">2025-12-20 10:52:46</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">c</tspan><tspan class="bold fg8">f155929</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1040" class="output">│ <tspan class="bold fg10">(empty)</tspan><tspan class="bold"> </tspan><tspan class="bold fg10">(no description set)</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1058" class="output">│ ○ <tspan class="bold fg5">s</tspan><tspan class="fg8">qmuzyqk</tspan> <tspan class="fg3">jjfan@example.com</tspan> <tspan class="fg6">2024-10-13 19:54:59</tspan> <tspan class="fg5">goodbye</tspan> <tspan class="bold fg4">8</tspan><tspan class="fg8">a6d28e6</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1058" class="output">│ ○ <tspan class="bold fg5">u</tspan><tspan class="fg8">trvlvoq</tspan> <tspan class="fg3">jjfan@example.com</tspan> <tspan class="fg6">2025-12-20 10:52:46</tspan> <tspan class="fg5">goodbye</tspan> <tspan class="bold fg4">1</tspan><tspan class="fg8">6f9208a</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1076" class="output">├─╯ <tspan class="fg3">(no description set)</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1094" class="output"><tspan class="bold fg14">◆</tspan> <tspan class="bold fg5">o</tspan><tspan class="fg8">rrkosyo</tspan> <tspan class="fg3">octocat@nowhere.com</tspan> <tspan class="fg6">2012-03-06 16:06:50</tspan> <tspan class="fg5">master</tspan> <tspan class="bold fg4">7</tspan><tspan class="fg8">fd1a60b</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1094" class="output"><tspan class="bold fg14">◆</tspan> <tspan class="bold fg5">o</tspan><tspan class="fg8">rrkosyo</tspan> <tspan class="fg3">octocat@nowhere.com</tspan> <tspan class="fg6">2012-03-06 17:06:50</tspan> <tspan class="fg5">master</tspan> <tspan class="bold fg4">7</tspan><tspan class="fg8">fd1a60b</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1112" class="output">│ <tspan class="fg2">(empty)</tspan> Merge pull request #6 from Spaceghost/patch-1
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1130" class="output">~
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1148" class="output">
|
||||
|
|
@ -103,10 +103,10 @@
|
|||
</tspan><tspan xml:space="preserve" x="10" y="1184" class="output"><tspan class="fg2"># the working copy is clean.</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1202" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1220" class="output">$ jj status
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1238" class="output">The working copy is clean
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1256" class="output">Working copy : <tspan class="bold fg13">l</tspan><tspan class="bold fg8">nmmqryq</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">4</tspan><tspan class="bold fg8">a26dc6e</tspan><tspan class="bold"> </tspan><tspan class="bold fg10">(empty)</tspan><tspan class="bold"> </tspan><tspan class="bold fg10">(no description set)</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1274" class="output">Parent commit: <tspan class="bold fg5">o</tspan><tspan class="fg8">rrkosyo</tspan> <tspan class="bold fg4">7</tspan><tspan class="fg8">fd1a60b</tspan> <tspan class="fg5">master</tspan><tspan class="fg8"> | </tspan><tspan class="fg2">(empty)</tspan> Merge pull request #6 from Spa<tspan class="hard-br" rotate="45" dx=".1em" dy="-.2em">↓</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1292" class="output">ceghost/patch-1
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1238" class="output">The working copy has no changes.
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1256" class="output">Working copy (@) : <tspan class="bold fg13">v</tspan><tspan class="bold fg8">yupzrxm</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">c</tspan><tspan class="bold fg8">f155929</tspan><tspan class="bold"> </tspan><tspan class="bold fg10">(empty)</tspan><tspan class="bold"> </tspan><tspan class="bold fg10">(no description set)</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1274" class="output">Parent commit (@-): <tspan class="bold fg5">o</tspan><tspan class="fg8">rrkosyo</tspan> <tspan class="bold fg4">7</tspan><tspan class="fg8">fd1a60b</tspan> <tspan class="fg5">master</tspan><tspan class="fg8"> | </tspan><tspan class="fg2">(empty)</tspan> Merge pull request #6 fro<tspan class="hard-br" rotate="45" dx=".1em" dy="-.2em">↓</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1292" class="output">m Spaceghost/patch-1
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1310" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1328" class="output"><tspan class="fg2"># Modify a file in this new change:</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1346" class="output">
|
||||
|
|
@ -114,9 +114,9 @@
|
|||
</tspan><tspan xml:space="preserve" x="10" y="1382" class="output">$ jj status
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1400" class="output">Working copy changes:
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1418" class="output"><tspan class="fg6">M README</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1436" class="output">Working copy : <tspan class="bold fg13">l</tspan><tspan class="bold fg8">nmmqryq</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">d</tspan><tspan class="bold fg8">edb65bd</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">(no description set)</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1454" class="output">Parent commit: <tspan class="bold fg5">o</tspan><tspan class="fg8">rrkosyo</tspan> <tspan class="bold fg4">7</tspan><tspan class="fg8">fd1a60b</tspan> <tspan class="fg5">master</tspan><tspan class="fg8"> | </tspan><tspan class="fg2">(empty)</tspan> Merge pull request #6 from Spa<tspan class="hard-br" rotate="45" dx=".1em" dy="-.2em">↓</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1472" class="output">ceghost/patch-1
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1436" class="output">Working copy (@) : <tspan class="bold fg13">v</tspan><tspan class="bold fg8">yupzrxm</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">d</tspan><tspan class="bold fg8">3002cba</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">(no description set)</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1454" class="output">Parent commit (@-): <tspan class="bold fg5">o</tspan><tspan class="fg8">rrkosyo</tspan> <tspan class="bold fg4">7</tspan><tspan class="fg8">fd1a60b</tspan> <tspan class="fg5">master</tspan><tspan class="fg8"> | </tspan><tspan class="fg2">(empty)</tspan> Merge pull request #6 fro<tspan class="hard-br" rotate="45" dx=".1em" dy="-.2em">↓</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1472" class="output">m Spaceghost/patch-1
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1490" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1508" class="output"><tspan class="fg2"># The working copy is not special; we can, for</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1526" class="output"><tspan class="fg2"># example, set the description of any commit.</tspan>
|
||||
|
|
@ -132,11 +132,11 @@
|
|||
</tspan><tspan xml:space="preserve" x="10" y="1706" class="output"><tspan class="fg2"># Inspect the result:</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1724" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1742" class="output">$ jj log
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1760" class="output">○ <tspan class="bold fg5">s</tspan><tspan class="fg8">qmuzyqk</tspan> <tspan class="fg3">jjfan@example.com</tspan> <tspan class="fg6">2024-10-13 19:54:59</tspan> <tspan class="fg5">goodbye</tspan> <tspan class="bold fg4">e</tspan><tspan class="fg8">3842b58</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1778" class="output">│ goodbye
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1796" class="output">│ <tspan class="bold fg2">@</tspan> <tspan class="bold fg13">l</tspan><tspan class="bold fg8">nmmqryq</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@example.com</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">2024-10-13 19:54:59</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">d</tspan><tspan class="bold fg8">7fadb8a</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1814" class="output">├─╯ <tspan class="bold">everyone</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1832" class="output"><tspan class="bold fg14">◆</tspan> <tspan class="bold fg5">o</tspan><tspan class="fg8">rrkosyo</tspan> <tspan class="fg3">octocat@nowhere.com</tspan> <tspan class="fg6">2012-03-06 16:06:50</tspan> <tspan class="fg5">master</tspan> <tspan class="bold fg4">7</tspan><tspan class="fg8">fd1a60b</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1760" class="output"><tspan class="bold fg2">@</tspan> <tspan class="bold fg13">v</tspan><tspan class="bold fg8">yupzrxm</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@example.com</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">2025-12-20 10:52:46</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">2</tspan><tspan class="bold fg8">b857ee9</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1778" class="output">│ <tspan class="bold">everyone</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1796" class="output">│ ○ <tspan class="bold fg5">u</tspan><tspan class="fg8">trvlvoq</tspan> <tspan class="fg3">jjfan@example.com</tspan> <tspan class="fg6">2025-12-20 10:52:46</tspan> <tspan class="fg5">goodbye</tspan> <tspan class="bold fg4">9</tspan><tspan class="fg8">a99c76c</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1814" class="output">├─╯ goodbye
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1832" class="output"><tspan class="bold fg14">◆</tspan> <tspan class="bold fg5">o</tspan><tspan class="fg8">rrkosyo</tspan> <tspan class="fg3">octocat@nowhere.com</tspan> <tspan class="fg6">2012-03-06 17:06:50</tspan> <tspan class="fg5">master</tspan> <tspan class="bold fg4">7</tspan><tspan class="fg8">fd1a60b</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1850" class="output">│ <tspan class="fg2">(empty)</tspan> Merge pull request #6 from Spaceghost/patch-1
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1868" class="output">~
|
||||
</tspan></text>
|
||||
|
|
|
|||
|
Before Width: | Height: | Size: 19 KiB After Width: | Height: | Size: 19 KiB |
|
|
@ -41,7 +41,7 @@ check-hidden = true
|
|||
# this list by running e.g. `uv run codespell --skip=./rendered-docs`
|
||||
# if you have less common ignored files or globally ignored files present.
|
||||
# Alternatively, try `uv run codespell $(jj file list)`.
|
||||
skip = "./target,./.jj,*.lock,./.git,./.venv,./.direnv"
|
||||
skip = "./target,./.jj,*.lock,./.git,./.venv,./.direnv,./demos/*.svg"
|
||||
ignore-words-list = "crate,ser,NotIn,Wirth,abd,ratatui,grey"
|
||||
dictionary = ".config/codespell-additional-dict,-"
|
||||
builtin = "clear,rare,en-GB_to_en-US"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue