ilyagr.bsky.social
just playing with tangled
More svg
+216
+130
demos/juggle-conflicts-new.svg
+130
demos/juggle-conflicts-new.svg
···
1
+
<!-- Created with term-transcript v0.3.0-beta.1 (https://github.com/slowli/term-transcript) -->
2
+
<svg viewBox="0 0 720 1650" width="720" height="1650" xmlns="http://www.w3.org/2000/svg">
3
+
<style>
4
+
.container {
5
+
font: 14px SFMono-Regular, Consolas, Liberation Mono, Menlo, monospace;
6
+
line-height: 18px;
7
+
}
8
+
.input,.output,.output-bg {
9
+
white-space: pre;
10
+
}
11
+
.input-bg { fill: #fff; fill-opacity: 0.1; }
12
+
.output-bg { user-select: none; text-rendering: geometricPrecision; stroke-width: 0.1; }
13
+
.bold,.prompt { font-weight: 600; }
14
+
.italic { font-style: italic; }
15
+
.underline { text-decoration: underline; }
16
+
.dimmed { fill-opacity: 0.7; }
17
+
.hard-br { font-size: 16px; fill-opacity: 0.8; user-select: none; }
18
+
.fg0 { fill: #1c1c1c; } .output-bg .fg0 { stroke: #1c1c1c; }
19
+
.fg1 { fill: #ff005b; } .output-bg .fg1 { stroke: #ff005b; }
20
+
.fg2 { fill: #cee318; } .output-bg .fg2 { stroke: #cee318; }
21
+
.fg3 { fill: #ffe755; } .output-bg .fg3 { stroke: #ffe755; }
22
+
.fg4 { fill: #048ac7; } .output-bg .fg4 { stroke: #048ac7; }
23
+
.fg5 { fill: #833c9f; } .output-bg .fg5 { stroke: #833c9f; }
24
+
.fg6 { fill: #0ac1cd; } .output-bg .fg6 { stroke: #0ac1cd; }
25
+
.fg7 { fill: #e5e5e5; } .output-bg .fg7 { stroke: #e5e5e5; }
26
+
.fg8 { fill: #666666; } .output-bg .fg8 { stroke: #666666; }
27
+
.fg9 { fill: #ff00a0; } .output-bg .fg9 { stroke: #ff00a0; }
28
+
.fg10 { fill: #ccff00; } .output-bg .fg10 { stroke: #ccff00; }
29
+
.fg11 { fill: #ff9f00; } .output-bg .fg11 { stroke: #ff9f00; }
30
+
.fg12 { fill: #48c6ff; } .output-bg .fg12 { stroke: #48c6ff; }
31
+
.fg13 { fill: #be67e1; } .output-bg .fg13 { stroke: #be67e1; }
32
+
.fg14 { fill: #63e7f0; } .output-bg .fg14 { stroke: #63e7f0; }
33
+
.fg15 { fill: #f3f3f3; } .output-bg .fg15 { stroke: #f3f3f3; }
34
+
</style>
35
+
<rect width="100%" height="100%" y="0" rx="4.5" style="fill: #1c1c1c;" />
36
+
<svg x="0" y="10" width="720" height="1630" viewBox="0 0 720 1630">
37
+
<g class="input-bg"><rect x="0" y="0" width="100%" height="22"></rect></g>
38
+
<text class="container fg7"><tspan xml:space="preserve" x="10" y="16" class="input"><tspan x="10" y="16"><tspan class="prompt">$</tspan> ./demo_juggle_conflicts.sh
39
+
</tspan></tspan><tspan xml:space="preserve" x="10" y="42" class="output">Initialized repo in "."
40
+
</tspan><tspan xml:space="preserve" x="10" y="60" class="output">Working copy now at: <tspan class="bold fg4">d</tspan><tspan class="fg8">5805a</tspan> (no description set)
41
+
</tspan><tspan xml:space="preserve" x="10" y="78" class="output">Working copy now at: <tspan class="bold fg4">93</tspan><tspan class="fg8">af0e</tspan> (no description set)
42
+
</tspan><tspan xml:space="preserve" x="10" y="96" class="output">Working copy now at: <tspan class="bold fg4">2</tspan><tspan class="fg8">bd940</tspan> (no description set)
43
+
</tspan><tspan xml:space="preserve" x="10" y="114" class="output">
44
+
</tspan><tspan xml:space="preserve" x="10" y="132" class="output"><tspan class="fg2"># We are in a repo with three commits, all</tspan>
45
+
</tspan><tspan xml:space="preserve" x="10" y="150" class="output"><tspan class="fg2"># editing the same line:</tspan>
46
+
</tspan><tspan xml:space="preserve" x="10" y="168" class="output">
47
+
</tspan><tspan xml:space="preserve" x="10" y="186" class="output">$ jj-old log
48
+
</tspan><tspan xml:space="preserve" x="10" y="204" class="output">@ <tspan class="bold fg13">NK</tspan><tspan class="bold fg8">TOTL</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">ilyagr@</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">now</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">2</tspan><tspan class="bold fg8">bd940</tspan>
49
+
</tspan><tspan xml:space="preserve" x="10" y="222" class="output">│ <tspan class="bold fg10">(empty)</tspan><tspan class="bold"> (no description set)</tspan>
50
+
</tspan><tspan xml:space="preserve" x="10" y="240" class="output">● <tspan class="bold fg5">Q</tspan><tspan class="fg8">OQXZS</tspan> <tspan class="fg3">ilyagr@</tspan> <tspan class="fg6">now</tspan> <tspan class="fg5">third</tspan> <tspan class="bold fg4">06</tspan><tspan class="fg8">0e2b</tspan>
51
+
</tspan><tspan xml:space="preserve" x="10" y="258" class="output">│ third
52
+
</tspan><tspan xml:space="preserve" x="10" y="276" class="output">● <tspan class="bold fg5">K</tspan><tspan class="fg8">PXUUW</tspan> <tspan class="fg3">ilyagr@</tspan> <tspan class="fg6">now</tspan> <tspan class="fg5">second</tspan> <tspan class="bold fg4">d3</tspan><tspan class="fg8">eacf</tspan>
53
+
</tspan><tspan xml:space="preserve" x="10" y="294" class="output">│ second
54
+
</tspan><tspan xml:space="preserve" x="10" y="312" class="output">● <tspan class="bold fg5">NO</tspan><tspan class="fg8">VOXL</tspan> <tspan class="fg3">ilyagr@</tspan> <tspan class="fg6">now</tspan> <tspan class="fg5">first</tspan> <tspan class="bold fg4">50</tspan><tspan class="fg8">df58</tspan>
55
+
</tspan><tspan xml:space="preserve" x="10" y="330" class="output">│ first
56
+
</tspan><tspan xml:space="preserve" x="10" y="348" class="output">● <tspan class="bold fg5">Z</tspan><tspan class="fg8">ZZZZZ</tspan> <tspan class="fg3">@</tspan> <tspan class="fg6">53 years ago</tspan> <tspan class="bold fg4">00</tspan><tspan class="fg8">0000</tspan>
57
+
</tspan><tspan xml:space="preserve" x="10" y="366" class="output"> <tspan class="fg2">(empty)</tspan> (no description set)
58
+
</tspan><tspan xml:space="preserve" x="10" y="384" class="output">$ jj diff -r first
59
+
</tspan><tspan xml:space="preserve" x="10" y="402" class="output"><tspan class="fg3">Added regular file file:</tspan>
60
+
</tspan><tspan xml:space="preserve" x="10" y="420" class="output"> <tspan class="fg2"> 1</tspan>: <tspan class="fg2">first</tspan>
61
+
</tspan><tspan xml:space="preserve" x="10" y="438" class="output">$ jj diff -r second
62
+
</tspan><tspan xml:space="preserve" x="10" y="456" class="output"><tspan class="fg3">Modified regular file file:</tspan>
63
+
</tspan><tspan xml:space="preserve" x="10" y="474" class="output"><tspan class="fg1"> 1</tspan> <tspan class="fg2"> 1</tspan>: <tspan class="fg1">first</tspan><tspan class="fg2">second</tspan>
64
+
</tspan><tspan xml:space="preserve" x="10" y="492" class="output">$ jj diff -r third
65
+
</tspan><tspan xml:space="preserve" x="10" y="510" class="output"><tspan class="fg3">Modified regular file file:</tspan>
66
+
</tspan><tspan xml:space="preserve" x="10" y="528" class="output"><tspan class="fg1"> 1</tspan> <tspan class="fg2"> 1</tspan>: <tspan class="fg1">second</tspan><tspan class="fg2">third</tspan>
67
+
</tspan><tspan xml:space="preserve" x="10" y="546" class="output">
68
+
</tspan><tspan xml:space="preserve" x="10" y="564" class="output"><tspan class="fg2"># Let's reorder the second and third commits:</tspan>
69
+
</tspan><tspan xml:space="preserve" x="10" y="582" class="output">
70
+
</tspan><tspan xml:space="preserve" x="10" y="600" class="output">$ jj rebase -s third -d first
71
+
</tspan><tspan xml:space="preserve" x="10" y="618" class="output">Rebased 2 commits
72
+
</tspan><tspan xml:space="preserve" x="10" y="636" class="output">Working copy now at: <tspan class="bold fg4">1</tspan><tspan class="fg8">3c256</tspan> (no description set)
73
+
</tspan><tspan xml:space="preserve" x="10" y="654" class="output">Added 0 files, modified 1 files, removed 0 files
74
+
</tspan><tspan xml:space="preserve" x="10" y="672" class="output">$ jj rebase -s second -d third
75
+
</tspan><tspan xml:space="preserve" x="10" y="690" class="output">Rebased 1 commits
76
+
</tspan><tspan xml:space="preserve" x="10" y="708" class="output">$ jj log
77
+
</tspan><tspan xml:space="preserve" x="10" y="726" class="output">◉ <tspan class="bold fg5">K</tspan><tspan class="fg8">PXUUW</tspan> <tspan class="fg3">ilyagr@</tspan> <tspan class="fg6">now</tspan> <tspan class="fg5">second</tspan> <tspan class="bold fg4">1e</tspan><tspan class="fg8">0529</tspan>
78
+
</tspan><tspan xml:space="preserve" x="10" y="744" class="output">│ second
79
+
</tspan><tspan xml:space="preserve" x="10" y="762" class="output">│ @ <tspan class="bold fg13">NK</tspan><tspan class="bold fg8">TOTL</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">ilyagr@</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">now</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">13</tspan><tspan class="bold fg8">c256</tspan><tspan class="bold"> </tspan><tspan class="bold fg9">conflict</tspan>
80
+
</tspan><tspan xml:space="preserve" x="10" y="780" class="output">├─╯ <tspan class="bold fg10">(empty)</tspan><tspan class="bold"> (no description set)</tspan>
81
+
</tspan><tspan xml:space="preserve" x="10" y="798" class="output">◉ <tspan class="bold fg5">Q</tspan><tspan class="fg8">OQXZS</tspan> <tspan class="fg3">ilyagr@</tspan> <tspan class="fg6">now</tspan> <tspan class="fg5">third</tspan> <tspan class="bold fg4">fa</tspan><tspan class="fg8">b226</tspan> <tspan class="fg1">conflict</tspan>
82
+
</tspan><tspan xml:space="preserve" x="10" y="816" class="output">│ third
83
+
</tspan><tspan xml:space="preserve" x="10" y="834" class="output">◉ <tspan class="bold fg5">NO</tspan><tspan class="fg8">VOXL</tspan> <tspan class="fg3">ilyagr@</tspan> <tspan class="fg6">now</tspan> <tspan class="fg5">first</tspan> <tspan class="bold fg4">50</tspan><tspan class="fg8">df58</tspan>
84
+
</tspan><tspan xml:space="preserve" x="10" y="852" class="output">│ first
85
+
</tspan><tspan xml:space="preserve" x="10" y="870" class="output">◉ <tspan class="bold fg5">Z</tspan><tspan class="fg8">ZZZZZ</tspan> <tspan class="fg3">@</tspan> <tspan class="fg6">53 years ago</tspan> <tspan class="bold fg4">00</tspan><tspan class="fg8">0000</tspan>
86
+
</tspan><tspan xml:space="preserve" x="10" y="888" class="output"> <tspan class="fg2">(empty)</tspan> (no description set)
87
+
</tspan><tspan xml:space="preserve" x="10" y="906" class="output">
88
+
</tspan><tspan xml:space="preserve" x="10" y="924" class="output"><tspan class="fg2"># The commit labeled "third" has a conflict,</tspan>
89
+
</tspan><tspan xml:space="preserve" x="10" y="942" class="output"><tspan class="fg2"># as expected. What's more interesting is</tspan>
90
+
</tspan><tspan xml:space="preserve" x="10" y="960" class="output"><tspan class="fg2"># that the top commit has no conflict! That's</tspan>
91
+
</tspan><tspan xml:space="preserve" x="10" y="978" class="output"><tspan class="fg2"># because it has the changes from all three</tspan>
92
+
</tspan><tspan xml:space="preserve" x="10" y="996" class="output"><tspan class="fg2"># commits applied to it.</tspan>
93
+
</tspan><tspan xml:space="preserve" x="10" y="1014" class="output">
94
+
</tspan><tspan xml:space="preserve" x="10" y="1032" class="output">
95
+
</tspan><tspan xml:space="preserve" x="10" y="1050" class="output"><tspan class="fg2"># Let's verify that by looking at its contents:</tspan>
96
+
</tspan><tspan xml:space="preserve" x="10" y="1068" class="output">
97
+
</tspan><tspan xml:space="preserve" x="10" y="1086" class="output">$ jj co second
98
+
</tspan><tspan xml:space="preserve" x="10" y="1104" class="output">Working copy now at: <tspan class="bold fg4">b</tspan><tspan class="fg8">1817f</tspan> (no description set)
99
+
</tspan><tspan xml:space="preserve" x="10" y="1122" class="output">Added 0 files, modified 1 files, removed 0 files
100
+
</tspan><tspan xml:space="preserve" x="10" y="1140" class="output">$ cat file
101
+
</tspan><tspan xml:space="preserve" x="10" y="1158" class="output">third
102
+
</tspan><tspan xml:space="preserve" x="10" y="1176" class="output">
103
+
</tspan><tspan xml:space="preserve" x="10" y="1194" class="output"><tspan class="fg2"># Let's now instead make "second" and "third"</tspan>
104
+
</tspan><tspan xml:space="preserve" x="10" y="1212" class="output"><tspan class="fg2"># sibling and merge them:</tspan>
105
+
</tspan><tspan xml:space="preserve" x="10" y="1230" class="output">
106
+
</tspan><tspan xml:space="preserve" x="10" y="1248" class="output">$ jj rebase -s second -d first
107
+
</tspan><tspan xml:space="preserve" x="10" y="1266" class="output">Rebased 2 commits
108
+
</tspan><tspan xml:space="preserve" x="10" y="1284" class="output">Working copy now at: <tspan class="bold fg4">7</tspan><tspan class="fg8">6f41e</tspan> (no description set)
109
+
</tspan><tspan xml:space="preserve" x="10" y="1302" class="output">Added 0 files, modified 1 files, removed 0 files
110
+
</tspan><tspan xml:space="preserve" x="10" y="1320" class="output">$ jj merge second third -m merged
111
+
</tspan><tspan xml:space="preserve" x="10" y="1338" class="output">Working copy now at: <tspan class="bold fg4">e</tspan><tspan class="fg8">c09ea</tspan> merged
112
+
</tspan><tspan xml:space="preserve" x="10" y="1356" class="output">Added 0 files, modified 1 files, removed 0 files
113
+
</tspan><tspan xml:space="preserve" x="10" y="1374" class="output">$ jj-old log
114
+
</tspan><tspan xml:space="preserve" x="10" y="1392" class="output">@ <tspan class="bold fg13">X</tspan><tspan class="bold fg8">YTYOU</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">ilyagr@</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">now</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">e</tspan><tspan class="bold fg8">c09ea</tspan>
115
+
</tspan><tspan xml:space="preserve" x="10" y="1410" class="output">├─╮ <tspan class="bold fg10">(empty)</tspan><tspan class="bold"> merged</tspan>
116
+
</tspan><tspan xml:space="preserve" x="10" y="1428" class="output">● │ <tspan class="bold fg5">K</tspan><tspan class="fg8">PXUUW</tspan> <tspan class="fg3">ilyagr@</tspan> <tspan class="fg6">now</tspan> <tspan class="fg5">second</tspan> <tspan class="bold fg4">9f</tspan><tspan class="fg8">55a5</tspan>
117
+
</tspan><tspan xml:space="preserve" x="10" y="1446" class="output">│ │ second
118
+
</tspan><tspan xml:space="preserve" x="10" y="1464" class="output">│ ● <tspan class="bold fg5">Q</tspan><tspan class="fg8">OQXZS</tspan> <tspan class="fg3">ilyagr@</tspan> <tspan class="fg6">now</tspan> <tspan class="fg5">third</tspan> <tspan class="bold fg4">fa</tspan><tspan class="fg8">b226</tspan> <tspan class="fg1">conflict</tspan>
119
+
</tspan><tspan xml:space="preserve" x="10" y="1482" class="output">├─╯ third
120
+
</tspan><tspan xml:space="preserve" x="10" y="1500" class="output">● <tspan class="bold fg5">N</tspan><tspan class="fg8">OVOXL</tspan> <tspan class="fg3">ilyagr@</tspan> <tspan class="fg6">now</tspan> <tspan class="fg5">first</tspan> <tspan class="bold fg4">50</tspan><tspan class="fg8">df58</tspan>
121
+
</tspan><tspan xml:space="preserve" x="10" y="1518" class="output">│ first
122
+
</tspan><tspan xml:space="preserve" x="10" y="1536" class="output">● <tspan class="bold fg5">Z</tspan><tspan class="fg8">ZZZZZ</tspan> <tspan class="fg3">@</tspan> <tspan class="fg6">53 years ago</tspan> <tspan class="bold fg4">00</tspan><tspan class="fg8">0000</tspan>
123
+
</tspan><tspan xml:space="preserve" x="10" y="1554" class="output"> <tspan class="fg2">(empty)</tspan> (no description set)
124
+
</tspan><tspan xml:space="preserve" x="10" y="1572" class="output">
125
+
</tspan><tspan xml:space="preserve" x="10" y="1590" class="output"><tspan class="fg2"># Again, because the merge commit has the</tspan>
126
+
</tspan><tspan xml:space="preserve" x="10" y="1608" class="output"><tspan class="fg2"># changes from all three commits, it has no</tspan>
127
+
</tspan><tspan xml:space="preserve" x="10" y="1626" class="output"><tspan class="fg2"># conflict.</tspan>
128
+
</tspan></text>
129
+
</svg>
130
+
</svg>
+86
demos/operation_log-new.svg
+86
demos/operation_log-new.svg
···
1
+
<!-- Created with term-transcript v0.3.0-beta.1 (https://github.com/slowli/term-transcript) -->
2
+
<svg viewBox="0 0 720 858" width="720" height="858" xmlns="http://www.w3.org/2000/svg">
3
+
<style>
4
+
.container {
5
+
font: 14px SFMono-Regular, Consolas, Liberation Mono, Menlo, monospace;
6
+
line-height: 18px;
7
+
}
8
+
.input,.output,.output-bg {
9
+
white-space: pre;
10
+
}
11
+
.input-bg { fill: #fff; fill-opacity: 0.1; }
12
+
.output-bg { user-select: none; text-rendering: geometricPrecision; stroke-width: 0.1; }
13
+
.bold,.prompt { font-weight: 600; }
14
+
.italic { font-style: italic; }
15
+
.underline { text-decoration: underline; }
16
+
.dimmed { fill-opacity: 0.7; }
17
+
.hard-br { font-size: 16px; fill-opacity: 0.8; user-select: none; }
18
+
.fg0 { fill: #1c1c1c; } .output-bg .fg0 { stroke: #1c1c1c; }
19
+
.fg1 { fill: #ff005b; } .output-bg .fg1 { stroke: #ff005b; }
20
+
.fg2 { fill: #cee318; } .output-bg .fg2 { stroke: #cee318; }
21
+
.fg3 { fill: #ffe755; } .output-bg .fg3 { stroke: #ffe755; }
22
+
.fg4 { fill: #048ac7; } .output-bg .fg4 { stroke: #048ac7; }
23
+
.fg5 { fill: #833c9f; } .output-bg .fg5 { stroke: #833c9f; }
24
+
.fg6 { fill: #0ac1cd; } .output-bg .fg6 { stroke: #0ac1cd; }
25
+
.fg7 { fill: #e5e5e5; } .output-bg .fg7 { stroke: #e5e5e5; }
26
+
.fg8 { fill: #666666; } .output-bg .fg8 { stroke: #666666; }
27
+
.fg9 { fill: #ff00a0; } .output-bg .fg9 { stroke: #ff00a0; }
28
+
.fg10 { fill: #ccff00; } .output-bg .fg10 { stroke: #ccff00; }
29
+
.fg11 { fill: #ff9f00; } .output-bg .fg11 { stroke: #ff9f00; }
30
+
.fg12 { fill: #48c6ff; } .output-bg .fg12 { stroke: #48c6ff; }
31
+
.fg13 { fill: #be67e1; } .output-bg .fg13 { stroke: #be67e1; }
32
+
.fg14 { fill: #63e7f0; } .output-bg .fg14 { stroke: #63e7f0; }
33
+
.fg15 { fill: #f3f3f3; } .output-bg .fg15 { stroke: #f3f3f3; }
34
+
</style>
35
+
<rect width="100%" height="100%" y="0" rx="4.5" style="fill: #1c1c1c;" />
36
+
<svg x="0" y="10" width="720" height="838" viewBox="0 0 720 838">
37
+
<g class="input-bg"><rect x="0" y="0" width="100%" height="22"></rect></g>
38
+
<text class="container fg7"><tspan xml:space="preserve" x="10" y="16" class="input"><tspan x="10" y="16"><tspan class="prompt">$</tspan> ./demo_operation_log.sh
39
+
</tspan></tspan><tspan xml:space="preserve" x="10" y="42" class="output">Fetching into new repo in "/tmp/tmp.5rjh019Ydx/Hello-World"
40
+
</tspan><tspan xml:space="preserve" x="10" y="60" class="output">Working copy now at: <tspan class="bold fg4">b1e</tspan><tspan class="fg8">fda</tspan> (no description set)
41
+
</tspan><tspan xml:space="preserve" x="10" y="78" class="output">Added 1 files, modified 0 files, removed 0 files
42
+
</tspan><tspan xml:space="preserve" x="10" y="96" class="output">
43
+
</tspan><tspan xml:space="preserve" x="10" y="114" class="output"><tspan class="fg2"># We are in the octocat/Hello-World repo.</tspan>
44
+
</tspan><tspan xml:space="preserve" x="10" y="132" class="output"><tspan class="fg2"># The "operation log" shows the operations</tspan>
45
+
</tspan><tspan xml:space="preserve" x="10" y="150" class="output"><tspan class="fg2"># so far:</tspan>
46
+
</tspan><tspan xml:space="preserve" x="10" y="168" class="output">
47
+
</tspan><tspan xml:space="preserve" x="10" y="186" class="output">$ jj op log
48
+
</tspan><tspan xml:space="preserve" x="10" y="204" class="output">@ <tspan class="bold fg12">084b81cf4f9e</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">ilyagr@dragon</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">now, lasted less than a microsecond</tspan>
49
+
</tspan><tspan xml:space="preserve" x="10" y="222" class="output">│ <tspan class="bold">check out git remote's default branch</tspan>
50
+
</tspan><tspan xml:space="preserve" x="10" y="240" class="output">│ <tspan class="bold fg5">args: jj git clone https://github.com/octocat/Hello-World</tspan>
51
+
</tspan><tspan xml:space="preserve" x="10" y="258" class="output">◉ <tspan class="fg4">54b106f458a1</tspan> <tspan class="fg3">ilyagr@dragon</tspan> <tspan class="fg6">now, lasted 481 milliseconds</tspan>
52
+
</tspan><tspan xml:space="preserve" x="10" y="276" class="output">│ fetch from git remote into empty repo
53
+
</tspan><tspan xml:space="preserve" x="10" y="294" class="output">│ <tspan class="fg5">args: jj git clone https://github.com/octocat/Hello-World</tspan>
54
+
</tspan><tspan xml:space="preserve" x="10" y="312" class="output">◉ <tspan class="fg4">24d3634b3b88</tspan> <tspan class="fg3">ilyagr@dragon</tspan> <tspan class="fg6">now, lasted less than a microsecond</tspan>
55
+
</tspan><tspan xml:space="preserve" x="10" y="330" class="output">│ add workspace 'default'
56
+
</tspan><tspan xml:space="preserve" x="10" y="348" class="output">◉ <tspan class="fg4">1a3c3b5dc00c</tspan> <tspan class="fg3">ilyagr@dragon</tspan> <tspan class="fg6">now, lasted less than a microsecond</tspan>
57
+
</tspan><tspan xml:space="preserve" x="10" y="366" class="output"> initialize repo
58
+
</tspan><tspan xml:space="preserve" x="10" y="384" class="output">
59
+
</tspan><tspan xml:space="preserve" x="10" y="402" class="output"><tspan class="fg2"># We are going to make some changes to show</tspan>
60
+
</tspan><tspan xml:space="preserve" x="10" y="420" class="output"><tspan class="fg2"># how the operation log works.</tspan>
61
+
</tspan><tspan xml:space="preserve" x="10" y="438" class="output"><tspan class="fg2"># We are currently working off of the "master"</tspan>
62
+
</tspan><tspan xml:space="preserve" x="10" y="456" class="output"><tspan class="fg2"># branch:</tspan>
63
+
</tspan><tspan xml:space="preserve" x="10" y="474" class="output">
64
+
</tspan><tspan xml:space="preserve" x="10" y="492" class="output">$ jj log
65
+
</tspan><tspan xml:space="preserve" x="10" y="510" class="output">@ <tspan class="bold fg13">NP</tspan><tspan class="bold fg8">WSYV</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">ilyagr@</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">now</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">b1e</tspan><tspan class="bold fg8">fda</tspan>
66
+
</tspan><tspan xml:space="preserve" x="10" y="528" class="output">│ <tspan class="bold fg10">(empty)</tspan><tspan class="bold"> (no description set)</tspan>
67
+
</tspan><tspan xml:space="preserve" x="10" y="546" class="output">◉ <tspan class="bold fg5">O</tspan><tspan class="fg8">RRKOS</tspan> <tspan class="fg3">octocat@</tspan> <tspan class="fg6">11 years ago</tspan> <tspan class="fg5">master</tspan> <tspan class="bold fg4">7f</tspan><tspan class="fg8">d1a6</tspan>
68
+
</tspan><tspan xml:space="preserve" x="10" y="564" class="output">│ <tspan class="fg2">(empty)</tspan> Merge pull request #6 from Spaceghost/patch-1
69
+
</tspan><tspan xml:space="preserve" x="10" y="582" class="output">~
70
+
</tspan><tspan xml:space="preserve" x="10" y="600" class="output">
71
+
</tspan><tspan xml:space="preserve" x="10" y="618" class="output"><tspan class="fg2"># Let's add a file, set a description, and</tspan>
72
+
</tspan><tspan xml:space="preserve" x="10" y="636" class="output"><tspan class="fg2"># rebase onto the "test" branch:</tspan>
73
+
</tspan><tspan xml:space="preserve" x="10" y="654" class="output">
74
+
</tspan><tspan xml:space="preserve" x="10" y="672" class="output">$ echo stuff > new-file
75
+
</tspan><tspan xml:space="preserve" x="10" y="690" class="output">$ jj describe -m stuff
76
+
</tspan><tspan xml:space="preserve" x="10" y="708" class="output">Working copy now at: <tspan class="bold fg4">bc</tspan><tspan class="fg8">2e05</tspan> stuff
77
+
</tspan><tspan xml:space="preserve" x="10" y="726" class="output">$ jj rebase -d test
78
+
</tspan><tspan xml:space="preserve" x="10" y="744" class="output">Rebased 1 commits
79
+
</tspan><tspan xml:space="preserve" x="10" y="762" class="output">Working copy now at: <tspan class="bold fg4">94</tspan><tspan class="fg8">d1ac</tspan> stuff
80
+
</tspan><tspan xml:space="preserve" x="10" y="780" class="output">Added 1 files, modified 0 files, removed 0 files
81
+
</tspan><tspan xml:space="preserve" x="10" y="798" class="output">
82
+
</tspan><tspan xml:space="preserve" x="10" y="816" class="output"><tspan class="fg2"># We are now going to make another change off of</tspan>
83
+
</tspan><tspan xml:space="preserve" x="10" y="834" class="output"><tspan class="fg2"># master:</tspan>
84
+
</tspan></text>
85
+
</svg>
86
+
</svg>
