martinvonz/jj
1
1
Fork 0
mirror of https://github.com/martinvonz/jj.git synced 2024-10-05 18:08:26 +03:00
Code Issues Packages Projects Releases Wiki Activity

demos: changes related to the new default log revset

Browse Source 
We remove some branches that would be shown by default and
remove `-r 'all()'` where it's no longer necessary.
This commit is contained in:
Ilya Grigoriev 2023-09-09 21:17:47 -07:00
parent a70ea9dfdc
commit 25d65d0801
8 changed files with 336 additions and 362 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
demos/demo_operation_log.sh
View File

@ -3,8 +3,12 @@ set -euo pipefail
. "$(dirname "$0")"/helpers.sh
new_tmp_dir
jj git clone https://github.com/octocat/Hello-World > /dev/null
cd Hello-World
{
jj git clone https://github.com/octocat/Hello-World
cd Hello-World
jj abandon octocat-patch-1
jj branch forget octocat-patch-1
} > /dev/null
comment "We are in the octocat/Hello-World repo.
The \"operation log\" shows the operations

12
demos/demo_resolve_conflicts.sh
View File

@ -3,12 +3,16 @@ set -euo pipefail
. "$(dirname "$0")"/helpers.sh
new_tmp_dir
jj git clone https://github.com/octocat/Hello-World > /dev/null
cd Hello-World
{
jj git clone https://github.com/octocat/Hello-World
cd Hello-World
jj abandon test
jj branch forget test
} > /dev/null
comment "We are on the master branch of the
octocat/Hello-World repo:"
run_command "jj log -r 'all()'"
run_command "jj log"
comment "Let's make an edit that will conflict
when we rebase it:"
@ -29,7 +33,7 @@ run_command "jj rebase -d b1"
comment "That seemed to succeed but we are also told there is now a conflict.
Let's take a look at the repo:"
run_command "jj log -r 'all()'"
run_command "jj log"
run_command "jj status"
comment "Indeed, the rebased commit has a conflict. The conflicted file

10
demos/demo_working_copy.sh
View File

@ -3,8 +3,14 @@ set -euo pipefail
. "$(dirname "$0")"/helpers.sh
new_tmp_dir
jj git clone https://github.com/octocat/Hello-World > /dev/null
cd Hello-World
{
jj git clone https://github.com/octocat/Hello-World
cd Hello-World
jj abandon test
jj branch forget test
jj abandon octocat-patch-1
jj branch forget octocat-patch-1
}> /dev/null
comment "We are in the octocat/Hello-World repo.
We have an empty working copy on top of master:"

18
demos/git_compat.svg
View File

@ -39,9 +39,9 @@
</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 "/tmp/tmp.8MxGFBZpqj/Hello-World"
</tspan><tspan xml:space="preserve" x="10" y="104" class="output">Working copy now at: <tspan class="bold fg13">op</tspan><tspan class="bold fg8">lronuy</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">0</tspan><tspan class="bold fg8">af35f48</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="122" class="output">Parent commit      : <tspan class="bold fg5">or</tspan><tspan class="fg8">rkosyo</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="86" class="output">Fetching into new repo in "/tmp/tmp.C155mhhXK5/Hello-World"
</tspan><tspan xml:space="preserve" x="10" y="104" class="output">Working copy now at: <tspan class="bold fg13">s</tspan><tspan class="bold fg8">kzsvnwo</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">5</tspan><tspan class="bold fg8">359150b</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="122" 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="140" class="output">om Spaceghost/patch-1
</tspan><tspan xml:space="preserve" x="10" y="158" class="output">Added 1 files, modified 0 files, removed 0 files
</tspan><tspan xml:space="preserve" x="10" y="176" class="output">$ cd Hello-World
@ -49,21 +49,21 @@
</tspan><tspan xml:space="preserve" x="10" y="212" class="output"><tspan class="fg2"># Inspect it:</tspan>
</tspan><tspan xml:space="preserve" x="10" y="230" class="output">
</tspan><tspan xml:space="preserve" x="10" y="248" class="output">$ jj log -r 'all()'
</tspan><tspan xml:space="preserve" x="10" y="266" class="output">@  <tspan class="bold fg13">op</tspan><tspan class="bold fg8">lronuy</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@example.com</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">2023-10-03 17:52:06.000 -07:00</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">0</tspan><tspan class="bold fg8">af35f48</tspan>
</tspan><tspan xml:space="preserve" x="10" y="266" class="output">@  <tspan class="bold fg13">s</tspan><tspan class="bold fg8">kzsvnwo</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@example.com</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">2023-10-03 17:53:24.000 -07:00</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">5</tspan><tspan class="bold fg8">359150b</tspan>
</tspan><tspan xml:space="preserve" x="10" y="284" 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="302" 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 12:55:19.000 -05:00</tspan>
</tspan><tspan xml:space="preserve" x="10" y="320" class="output">├─╯  <tspan class="fg5">octocat-patch-1</tspan> <tspan class="bold fg4">b1</tspan><tspan class="fg8">b3f972</tspan>
</tspan><tspan xml:space="preserve" x="10" y="338" class="output">│    sentence case
</tspan><tspan xml:space="preserve" x="10" y="356" 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.000 -07:00</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="374" class="output">├─╯  Create CONTRIBUTING.md
</tspan><tspan xml:space="preserve" x="10" y="392" class="output">◉    <tspan class="bold fg5">or</tspan><tspan class="fg8">rkosyo</tspan> <tspan class="fg3">octocat@nowhere.com</tspan> <tspan class="fg6">2012-03-06 15:06:50.000 -08:00</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="392" class="output">◉    <tspan class="bold fg5">o</tspan><tspan class="fg8">rrkosyo</tspan> <tspan class="fg3">octocat@nowhere.com</tspan> <tspan class="fg6">2012-03-06 15:06:50.000 -08:00</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="410" class="output">├─╮  <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="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.000 -07:00</tspan>
</tspan><tspan xml:space="preserve" x="10" y="446" class="output">├─╯  <tspan class="bold fg4">76</tspan><tspan class="fg8">294131</tspan>
</tspan><tspan xml:space="preserve" x="10" y="464" class="output">│    New line at end of file. --Signed off by Spaceghost
</tspan><tspan xml:space="preserve" x="10" y="482" class="output">◉  <tspan class="bold fg5">s</tspan><tspan class="fg8">yktoqts</tspan> <tspan class="fg3">cameron@github.com</tspan> <tspan class="fg6">2011-01-26 11:06:08.000 -08:00</tspan> <tspan class="bold fg4">5</tspan><tspan class="fg8">53c2077</tspan>
</tspan><tspan xml:space="preserve" x="10" y="482" class="output">◉  <tspan class="bold fg5">sy</tspan><tspan class="fg8">ktoqts</tspan> <tspan class="fg3">cameron@github.com</tspan> <tspan class="fg6">2011-01-26 11:06:08.000 -08:00</tspan> <tspan class="bold fg4">55</tspan><tspan class="fg8">3c2077</tspan>
</tspan><tspan xml:space="preserve" x="10" y="500" class="output">│  first commit
</tspan><tspan xml:space="preserve" x="10" y="518" class="output">◉  <tspan class="bold fg5">z</tspan><tspan class="fg8">zzzzzzz</tspan> <tspan class="fg2">root()</tspan> <tspan class="bold fg4">00</tspan><tspan class="fg8">000000</tspan>
</tspan><tspan xml:space="preserve" x="10" y="518" class="output">◉  <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="536" class="output">
</tspan><tspan xml:space="preserve" x="10" y="554" class="output">$ jj diff -r b1
</tspan><tspan xml:space="preserve" x="10" y="572" class="output"><tspan class="fg3">Modified regular file README:</tspan>
@ -72,8 +72,8 @@
</tspan><tspan xml:space="preserve" x="10" y="626" class="output"><tspan class="fg2"># The repo is backed by the actual Git repo:</tspan>
</tspan><tspan xml:space="preserve" x="10" y="644" class="output">
</tspan><tspan xml:space="preserve" x="10" y="662" class="output">$ git --git-dir=.jj/repo/store/git log --graph --all --decorate --oneline
</tspan><tspan xml:space="preserve" x="10" y="680" class="output">* <tspan class="fg3">b79d37f</tspan> 
</tspan><tspan xml:space="preserve" x="10" y="698" class="output">* <tspan class="fg3">0af35f4</tspan> 
</tspan><tspan xml:space="preserve" x="10" y="680" class="output">* <tspan class="fg3">d232bdd</tspan> 
</tspan><tspan xml:space="preserve" x="10" y="698" class="output">* <tspan class="fg3">5359150</tspan> 
</tspan><tspan xml:space="preserve" x="10" y="716" 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="734" class="output"><tspan class="fg1">|</tspan><tspan class="fg1">/</tspan>  
</tspan><tspan xml:space="preserve" x="10" y="752" 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

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.9 KiB

After

Width:  |  Height:  |  Size: 9.9 KiB

42
demos/juggle_conflicts.svg
View File

@ -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 fg13">r</tspan><tspan class="bold fg8">trqxtor</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@example.com</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">2023-10-03 17:52:07.433 -07:00</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">d</tspan><tspan class="bold fg8">728789b</tspan>
</tspan><tspan xml:space="preserve" x="10" y="104" class="output">@  <tspan class="bold fg13">y</tspan><tspan class="bold fg8">unnnwvo</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@example.com</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">2023-10-03 17:53:25.563 -07:00</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">3</tspan><tspan class="bold fg8">8d0479d</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">q</tspan><tspan class="fg8">syokrkk</tspan> <tspan class="fg3">jjfan@example.com</tspan> <tspan class="fg6">2023-10-03 17:52:07.433 -07:00</tspan> <tspan class="fg5">third</tspan> <tspan class="bold fg4">8</tspan><tspan class="fg8">5066d2a</tspan>
</tspan><tspan xml:space="preserve" x="10" y="140" class="output">◉  <tspan class="bold fg5">n</tspan><tspan class="fg8">vktsnuz</tspan> <tspan class="fg3">jjfan@example.com</tspan> <tspan class="fg6">2023-10-03 17:53:25.563 -07:00</tspan> <tspan class="fg5">third</tspan> <tspan class="bold fg4">e</tspan><tspan class="fg8">e26fd86</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">p</tspan><tspan class="fg8">mlzoorv</tspan> <tspan class="fg3">jjfan@example.com</tspan> <tspan class="fg6">2023-10-03 17:52:07.372 -07:00</tspan> <tspan class="fg5">second</tspan> <tspan class="bold fg4">6</tspan><tspan class="fg8">a11efb9</tspan>
</tspan><tspan xml:space="preserve" x="10" y="176" class="output">◉  <tspan class="bold fg5">o</tspan><tspan class="fg8">ozovxnq</tspan> <tspan class="fg3">jjfan@example.com</tspan> <tspan class="fg6">2023-10-03 17:53:25.502 -07:00</tspan> <tspan class="fg5">second</tspan> <tspan class="bold fg4">1</tspan><tspan class="fg8">242b1fd</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">m</tspan><tspan class="fg8">zssttms</tspan> <tspan class="fg3">jjfan@example.com</tspan> <tspan class="fg6">2023-10-03 17:52:07.312 -07:00</tspan> <tspan class="fg5">first</tspan> <tspan class="bold fg4">c</tspan><tspan class="fg8">2cb2cfa</tspan>
</tspan><tspan xml:space="preserve" x="10" y="212" class="output">◉  <tspan class="bold fg5">q</tspan><tspan class="fg8">vwkrmvo</tspan> <tspan class="fg3">jjfan@example.com</tspan> <tspan class="fg6">2023-10-03 17:53:25.439 -07:00</tspan> <tspan class="fg5">first</tspan> <tspan class="bold fg4">5</tspan><tspan class="fg8">13e2a6d</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 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
@ -63,20 +63,20 @@
</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="500" class="output">Rebased 2 commits
</tspan><tspan xml:space="preserve" x="10" y="518" class="output">Working copy now at: <tspan class="bold fg13">r</tspan><tspan class="bold fg8">trqxtor</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">b</tspan><tspan class="bold fg8">88d4fbd</tspan><tspan class="bold"> </tspan><tspan class="bold fg9">(conflict)</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="536" class="output">Parent commit      : <tspan class="bold fg5">q</tspan><tspan class="fg8">syokrkk</tspan> <tspan class="bold fg4">a</tspan><tspan class="fg8">b068262</tspan> <tspan class="fg5">third</tspan><tspan class="fg8"> | </tspan><tspan class="fg1">(conflict)</tspan> third
</tspan><tspan xml:space="preserve" x="10" y="518" class="output">Working copy now at: <tspan class="bold fg13">y</tspan><tspan class="bold fg8">unnnwvo</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">3</tspan><tspan class="bold fg8">f07a2de</tspan><tspan class="bold"> </tspan><tspan class="bold fg9">(conflict)</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="536" class="output">Parent commit      : <tspan class="bold fg5">n</tspan><tspan class="fg8">vktsnuz</tspan> <tspan class="bold fg4">9</tspan><tspan class="fg8">be78b4c</tspan> <tspan class="fg5">third</tspan><tspan class="fg8"> | </tspan><tspan class="fg1">(conflict)</tspan> third
</tspan><tspan xml:space="preserve" x="10" y="554" class="output">Added 0 files, modified 1 files, removed 0 files
</tspan><tspan xml:space="preserve" x="10" y="572" class="output">$ jj rebase -s second -d third
</tspan><tspan xml:space="preserve" x="10" y="590" class="output">Rebased 1 commits
</tspan><tspan xml:space="preserve" x="10" y="608" class="output">$ jj log
</tspan><tspan xml:space="preserve" x="10" y="626" class="output">◉  <tspan class="bold fg5">p</tspan><tspan class="fg8">mlzoorv</tspan> <tspan class="fg3">jjfan@example.com</tspan> <tspan class="fg6">2023-10-03 17:52:07.615 -07:00</tspan> <tspan class="fg5">second</tspan> <tspan class="bold fg4">6</tspan><tspan class="fg8">0ef6ed1</tspan>
</tspan><tspan xml:space="preserve" x="10" y="626" class="output">◉  <tspan class="bold fg5">o</tspan><tspan class="fg8">ozovxnq</tspan> <tspan class="fg3">jjfan@example.com</tspan> <tspan class="fg6">2023-10-03 17:53:25.742 -07:00</tspan> <tspan class="fg5">second</tspan> <tspan class="bold fg4">d</tspan><tspan class="fg8">b5b5e19</tspan>
</tspan><tspan xml:space="preserve" x="10" y="644" class="output">│  second
</tspan><tspan xml:space="preserve" x="10" y="662" class="output">│ @  <tspan class="bold fg13">r</tspan><tspan class="bold fg8">trqxtor</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@example.com</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">2023-10-03 17:52:07.583 -07:00</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">b</tspan><tspan class="bold fg8">88d4fbd</tspan><tspan class="bold"> </tspan><tspan class="bold fg9">conflict</tspan>
</tspan><tspan xml:space="preserve" x="10" y="662" class="output">│ @  <tspan class="bold fg13">y</tspan><tspan class="bold fg8">unnnwvo</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@example.com</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">2023-10-03 17:53:25.712 -07:00</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">3</tspan><tspan class="bold fg8">f07a2de</tspan><tspan class="bold"> </tspan><tspan class="bold fg9">conflict</tspan>
</tspan><tspan xml:space="preserve" x="10" y="680" 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="698" class="output">◉  <tspan class="bold fg5">q</tspan><tspan class="fg8">syokrkk</tspan> <tspan class="fg3">jjfan@example.com</tspan> <tspan class="fg6">2023-10-03 17:52:07.583 -07:00</tspan> <tspan class="fg5">third</tspan> <tspan class="bold fg4">a</tspan><tspan class="fg8">b068262</tspan>
</tspan><tspan xml:space="preserve" x="10" y="698" class="output">◉  <tspan class="bold fg5">n</tspan><tspan class="fg8">vktsnuz</tspan> <tspan class="fg3">jjfan@example.com</tspan> <tspan class="fg6">2023-10-03 17:53:25.712 -07:00</tspan> <tspan class="fg5">third</tspan> <tspan class="bold fg4">9</tspan><tspan class="fg8">be78b4c</tspan>
</tspan><tspan xml:space="preserve" x="10" y="716" class="output">│  <tspan class="fg1">conflict</tspan>
</tspan><tspan xml:space="preserve" x="10" y="734" class="output">│  third
</tspan><tspan xml:space="preserve" x="10" y="752" class="output">◉  <tspan class="bold fg5">m</tspan><tspan class="fg8">zssttms</tspan> <tspan class="fg3">jjfan@example.com</tspan> <tspan class="fg6">2023-10-03 17:52:07.312 -07:00</tspan> <tspan class="fg5">first</tspan> <tspan class="bold fg4">c</tspan><tspan class="fg8">2cb2cfa</tspan>
</tspan><tspan xml:space="preserve" x="10" y="752" class="output">◉  <tspan class="bold fg5">q</tspan><tspan class="fg8">vwkrmvo</tspan> <tspan class="fg3">jjfan@example.com</tspan> <tspan class="fg6">2023-10-03 17:53:25.439 -07:00</tspan> <tspan class="fg5">first</tspan> <tspan class="bold fg4">5</tspan><tspan class="fg8">13e2a6d</tspan>
</tspan><tspan xml:space="preserve" x="10" y="770" class="output">│  first
</tspan><tspan xml:space="preserve" x="10" y="788" class="output">◉  <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="806" class="output">
@ -87,8 +87,8 @@
</tspan><tspan xml:space="preserve" x="10" y="896" class="output"><tspan class="fg2"># Let's verify that by looking at its contents:</tspan>
</tspan><tspan xml:space="preserve" x="10" y="914" class="output">
</tspan><tspan xml:space="preserve" x="10" y="932" class="output">$ jj co second
</tspan><tspan xml:space="preserve" x="10" y="950" class="output">Working copy now at: <tspan class="bold fg13">pn</tspan><tspan class="bold fg8">tkxysq</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">d</tspan><tspan class="bold fg8">04ba185</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="968" class="output">Parent commit      : <tspan class="bold fg5">pm</tspan><tspan class="fg8">lzoorv</tspan> <tspan class="bold fg4">6</tspan><tspan class="fg8">0ef6ed1</tspan> <tspan class="fg5">second</tspan><tspan class="fg8"> | </tspan>second
</tspan><tspan xml:space="preserve" x="10" y="950" class="output">Working copy now at: <tspan class="bold fg13">p</tspan><tspan class="bold fg8">pxyrxtk</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">a</tspan><tspan class="bold fg8">9b71825</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="968" class="output">Parent commit      : <tspan class="bold fg5">o</tspan><tspan class="fg8">ozovxnq</tspan> <tspan class="bold fg4">d</tspan><tspan class="fg8">b5b5e19</tspan> <tspan class="fg5">second</tspan><tspan class="fg8"> | </tspan>second
</tspan><tspan xml:space="preserve" x="10" y="986" class="output">Added 0 files, modified 1 files, removed 0 files
</tspan><tspan xml:space="preserve" x="10" y="1004" class="output">$ cat file
</tspan><tspan xml:space="preserve" x="10" y="1022" class="output">third
@ -98,23 +98,23 @@
</tspan><tspan xml:space="preserve" x="10" y="1094" class="output">
</tspan><tspan xml:space="preserve" x="10" y="1112" class="output">$ jj rebase -s second -d first
</tspan><tspan xml:space="preserve" x="10" y="1130" class="output">Rebased 2 commits
</tspan><tspan xml:space="preserve" x="10" y="1148" class="output">Working copy now at: <tspan class="bold fg13">pn</tspan><tspan class="bold fg8">tkxysq</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">8</tspan><tspan class="bold fg8">e1a878a</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="1166" class="output">Parent commit      : <tspan class="bold fg5">pm</tspan><tspan class="fg8">lzoorv</tspan> <tspan class="bold fg4">a4</tspan><tspan class="fg8">f3850e</tspan> <tspan class="fg5">second</tspan><tspan class="fg8"> | </tspan>second
</tspan><tspan xml:space="preserve" x="10" y="1148" class="output">Working copy now at: <tspan class="bold fg13">p</tspan><tspan class="bold fg8">pxyrxtk</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">4</tspan><tspan class="bold fg8">6d0cfc1</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="1166" class="output">Parent commit      : <tspan class="bold fg5">o</tspan><tspan class="fg8">ozovxnq</tspan> <tspan class="bold fg4">7</tspan><tspan class="fg8">507959f</tspan> <tspan class="fg5">second</tspan><tspan class="fg8"> | </tspan>second
</tspan><tspan xml:space="preserve" x="10" y="1184" class="output">Added 0 files, modified 1 files, removed 0 files
</tspan><tspan xml:space="preserve" x="10" y="1202" class="output">$ jj merge second third -m merged
</tspan><tspan xml:space="preserve" x="10" y="1220" class="output">Working copy now at: <tspan class="bold fg13">t</tspan><tspan class="bold fg8">rtwrukv</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">1</tspan><tspan class="bold fg8">b5ba1cc</tspan><tspan class="bold"> </tspan><tspan class="bold fg10">(empty)</tspan><tspan class="bold"> merged</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1238" class="output">Parent commit      : <tspan class="bold fg5">p</tspan><tspan class="fg8">mlzoorv</tspan> <tspan class="bold fg4">a4</tspan><tspan class="fg8">f3850e</tspan> <tspan class="fg5">second</tspan><tspan class="fg8"> | </tspan>second
</tspan><tspan xml:space="preserve" x="10" y="1256" class="output">Parent commit      : <tspan class="bold fg5">q</tspan><tspan class="fg8">syokrkk</tspan> <tspan class="bold fg4">ab</tspan><tspan class="fg8">068262</tspan> <tspan class="fg5">third</tspan><tspan class="fg8"> | </tspan><tspan class="fg1">(conflict)</tspan> third
</tspan><tspan xml:space="preserve" x="10" y="1220" class="output">Working copy now at: <tspan class="bold fg13">t</tspan><tspan class="bold fg8">umuouyq</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">c</tspan><tspan class="bold fg8">f68a830</tspan><tspan class="bold"> </tspan><tspan class="bold fg10">(empty)</tspan><tspan class="bold"> merged</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1238" class="output">Parent commit      : <tspan class="bold fg5">o</tspan><tspan class="fg8">ozovxnq</tspan> <tspan class="bold fg4">7</tspan><tspan class="fg8">507959f</tspan> <tspan class="fg5">second</tspan><tspan class="fg8"> | </tspan>second
</tspan><tspan xml:space="preserve" x="10" y="1256" class="output">Parent commit      : <tspan class="bold fg5">n</tspan><tspan class="fg8">vktsnuz</tspan> <tspan class="bold fg4">9</tspan><tspan class="fg8">be78b4c</tspan> <tspan class="fg5">third</tspan><tspan class="fg8"> | </tspan><tspan class="fg1">(conflict)</tspan> third
</tspan><tspan xml:space="preserve" x="10" y="1274" class="output">Added 0 files, modified 1 files, removed 0 files
</tspan><tspan xml:space="preserve" x="10" y="1292" class="output">$ jj log
</tspan><tspan xml:space="preserve" x="10" y="1310" class="output">@    <tspan class="bold fg13">t</tspan><tspan class="bold fg8">rtwrukv</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@example.com</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">2023-10-03 17:52:07.739 -07:00</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">1</tspan><tspan class="bold fg8">b5ba1cc</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1310" class="output">@    <tspan class="bold fg13">t</tspan><tspan class="bold fg8">umuouyq</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@example.com</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">2023-10-03 17:53:25.868 -07:00</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">c</tspan><tspan class="bold fg8">f68a830</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1328" class="output">├─╮  <tspan class="bold fg10">(empty)</tspan><tspan class="bold"> merged</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1346" class="output">│ ◉  <tspan class="bold fg5">q</tspan><tspan class="fg8">syokrkk</tspan> <tspan class="fg3">jjfan@example.com</tspan> <tspan class="fg6">2023-10-03 17:52:07.583 -07:00</tspan> <tspan class="fg5">third</tspan> <tspan class="bold fg4">ab</tspan><tspan class="fg8">068262</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1346" class="output">│ ◉  <tspan class="bold fg5">n</tspan><tspan class="fg8">vktsnuz</tspan> <tspan class="fg3">jjfan@example.com</tspan> <tspan class="fg6">2023-10-03 17:53:25.712 -07:00</tspan> <tspan class="fg5">third</tspan> <tspan class="bold fg4">9</tspan><tspan class="fg8">be78b4c</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1364" class="output">│ │  <tspan class="fg1">conflict</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1382" class="output">│ │  third
</tspan><tspan xml:space="preserve" x="10" y="1400" class="output">◉ │  <tspan class="bold fg5">p</tspan><tspan class="fg8">mlzoorv</tspan> <tspan class="fg3">jjfan@example.com</tspan> <tspan class="fg6">2023-10-03 17:52:07.708 -07:00</tspan> <tspan class="fg5">second</tspan> <tspan class="bold fg4">a4</tspan><tspan class="fg8">f3850e</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1400" class="output">◉ │  <tspan class="bold fg5">o</tspan><tspan class="fg8">ozovxnq</tspan> <tspan class="fg3">jjfan@example.com</tspan> <tspan class="fg6">2023-10-03 17:53:25.838 -07:00</tspan> <tspan class="fg5">second</tspan> <tspan class="bold fg4">7</tspan><tspan class="fg8">507959f</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1418" class="output">├─╯  second
</tspan><tspan xml:space="preserve" x="10" y="1436" class="output">◉  <tspan class="bold fg5">m</tspan><tspan class="fg8">zssttms</tspan> <tspan class="fg3">jjfan@example.com</tspan> <tspan class="fg6">2023-10-03 17:52:07.312 -07:00</tspan> <tspan class="fg5">first</tspan> <tspan class="bold fg4">c</tspan><tspan class="fg8">2cb2cfa</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1436" class="output">◉  <tspan class="bold fg5">q</tspan><tspan class="fg8">vwkrmvo</tspan> <tspan class="fg3">jjfan@example.com</tspan> <tspan class="fg6">2023-10-03 17:53:25.439 -07:00</tspan> <tspan class="fg5">first</tspan> <tspan class="bold fg4">5</tspan><tspan class="fg8">13e2a6d</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1454" class="output">│  first
</tspan><tspan xml:space="preserve" x="10" y="1472" class="output">◉  <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="1490" class="output">

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 17 KiB

228
demos/operation_log.svg
View File

@ -1,5 +1,5 @@
<!-- Created with term-transcript v0.3.0 (https://github.com/slowli/term-transcript) -->
<svg viewBox="0 0 720 2468" width="720" height="2468" xmlns="http://www.w3.org/2000/svg">
<svg viewBox="0 0 720 2360" width="720" height="2360" xmlns="http://www.w3.org/2000/svg">
<style>
.container {
font: 14px Fira Code, Liberation Mono, SFMono-Regular, Consolas, Menlo, monospace;
@ -33,7 +33,7 @@
.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="2448" viewBox="0 0 720 2448">
<svg x="0" y="10" width="720" height="2340" viewBox="0 0 720 2340">
<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 in the octocat/Hello-World repo.</tspan>
@ -41,93 +41,93 @@
</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 fg12">845481e61aaa</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@jujube</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">now, lasted 1 millisecond</tspan>
</tspan><tspan xml:space="preserve" x="10" y="140" class="output">│  <tspan class="bold">check out git remote's default branch</tspan>
</tspan><tspan xml:space="preserve" x="10" y="158" class="output">│  <tspan class="bold fg5">args: jj git clone https://github.com/octocat/Hello-World</tspan>
</tspan><tspan xml:space="preserve" x="10" y="176" class="output">◉  <tspan class="fg4">f8c5a185ca4c</tspan> <tspan class="fg3">jjfan@jujube</tspan> <tspan class="fg6">now, lasted 392 milliseconds</tspan>
</tspan><tspan xml:space="preserve" x="10" y="194" class="output">│  fetch from git remote into empty repo
</tspan><tspan xml:space="preserve" x="10" y="212" class="output">│  <tspan class="fg5">args: jj git clone https://github.com/octocat/Hello-World</tspan>
</tspan><tspan xml:space="preserve" x="10" y="230" class="output">◉  <tspan class="fg4">5c7d32912b0b</tspan> <tspan class="fg3">jjfan@jujube</tspan> <tspan class="fg6">now, lasted 1 millisecond</tspan>
</tspan><tspan xml:space="preserve" x="10" y="248" class="output">│  add workspace 'default'
</tspan><tspan xml:space="preserve" x="10" y="266" class="output">◉  <tspan class="fg4">0fdc6a086c35</tspan> <tspan class="fg3">jjfan@jujube</tspan> <tspan class="fg6">now, lasted less than a microsecond</tspan>
</tspan><tspan xml:space="preserve" x="10" y="284" class="output">   initialize repo
</tspan><tspan xml:space="preserve" x="10" y="302" class="output">
</tspan><tspan xml:space="preserve" x="10" y="320" class="output"><tspan class="fg2"># We are going to make some changes to show</tspan>
</tspan><tspan xml:space="preserve" x="10" y="338" class="output"><tspan class="fg2"># how the operation log works. Let's add a file, set</tspan>
</tspan><tspan xml:space="preserve" x="10" y="356" class="output"><tspan class="fg2"># a description, and rebase onto the "test" branch:</tspan>
</tspan><tspan xml:space="preserve" x="10" y="374" class="output">
</tspan><tspan xml:space="preserve" x="10" y="392" class="output">$ echo stuff &gt; new-file
</tspan><tspan xml:space="preserve" x="10" y="410" class="output">$ jj describe -m stuff
</tspan><tspan xml:space="preserve" x="10" y="428" class="output">Working copy now at: <tspan class="bold fg13">s</tspan><tspan class="bold fg8">tlkvnrx</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">a</tspan><tspan class="bold fg8">b94989a</tspan><tspan class="bold"> stuff</tspan>
</tspan><tspan xml:space="preserve" x="10" y="446" 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="464" class="output">om Spaceghost/patch-1
</tspan><tspan xml:space="preserve" x="10" y="482" class="output">$ jj rebase -d test
</tspan><tspan xml:space="preserve" x="10" y="500" class="output">Rebased 1 commits
</tspan><tspan xml:space="preserve" x="10" y="518" class="output">Working copy now at: <tspan class="bold fg13">s</tspan><tspan class="bold fg8">tlkvnrx</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">4</tspan><tspan class="bold fg8">7f07ef4</tspan><tspan class="bold"> stuff</tspan>
</tspan><tspan xml:space="preserve" x="10" y="536" class="output">Parent commit      : <tspan class="bold fg5">k</tspan><tspan class="fg8">owxouwz</tspan> <tspan class="bold fg4">b3</tspan><tspan class="fg8">cbd5bb</tspan> <tspan class="fg5">test</tspan><tspan class="fg8"> | </tspan>Create CONTRIBUTING.md
</tspan><tspan xml:space="preserve" x="10" y="554" class="output">Added 1 files, modified 0 files, removed 0 files
</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"># We are now going to make another change off of</tspan>
</tspan><tspan xml:space="preserve" x="10" y="608" class="output"><tspan class="fg2"># master:</tspan>
</tspan><tspan xml:space="preserve" x="10" y="626" class="output">
</tspan><tspan xml:space="preserve" x="10" y="644" class="output">$ jj co master
</tspan><tspan xml:space="preserve" x="10" y="662" class="output">Working copy now at: <tspan class="bold fg13">y</tspan><tspan class="bold fg8">uknqtsx</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">f</tspan><tspan class="bold fg8">18fb500</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="680" 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="698" class="output">om Spaceghost/patch-1
</tspan><tspan xml:space="preserve" x="10" y="716" class="output">Added 0 files, modified 0 files, removed 2 files
</tspan><tspan xml:space="preserve" x="10" y="734" class="output">$ jj describe -m "other stuff"
</tspan><tspan xml:space="preserve" x="10" y="752" class="output">Working copy now at: <tspan class="bold fg13">y</tspan><tspan class="bold fg8">uknqtsx</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">1</tspan><tspan class="bold fg8">2e96f12</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="770" 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="788" class="output">om 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 class="fg2"># The repo now looks like this:</tspan>
</tspan><tspan xml:space="preserve" x="10" y="842" class="output">
</tspan><tspan xml:space="preserve" x="10" y="860" class="output">$ jj log
</tspan><tspan xml:space="preserve" x="10" y="878" class="output">@  <tspan class="bold fg13">y</tspan><tspan class="bold fg8">uknqtsx</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@example.com</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">2023-10-03 17:52:08.000 -07:00</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">1</tspan><tspan class="bold fg8">2e96f12</tspan>
</tspan><tspan xml:space="preserve" x="10" y="896" class="output">│  <tspan class="bold fg10">(empty)</tspan><tspan class="bold"> other stuff</tspan>
</tspan><tspan xml:space="preserve" x="10" y="914" 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 12:55:19.000 -05:00</tspan>
</tspan><tspan xml:space="preserve" x="10" y="932" class="output">├─╯  <tspan class="fg5">octocat-patch-1</tspan> <tspan class="bold fg4">b1</tspan><tspan class="fg8">b3f972</tspan>
</tspan><tspan xml:space="preserve" x="10" y="950" class="output">│    sentence case
</tspan><tspan xml:space="preserve" x="10" y="968" class="output">│ ◉  <tspan class="bold fg5">s</tspan><tspan class="fg8">tlkvnrx</tspan> <tspan class="fg3">jjfan@example.com</tspan> <tspan class="fg6">2023-10-03 17:52:08.000 -07:00</tspan> <tspan class="bold fg4">4</tspan><tspan class="fg8">7f07ef4</tspan>
</tspan><tspan xml:space="preserve" x="10" y="986" class="output">│ │  stuff
</tspan><tspan xml:space="preserve" x="10" y="1004" 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.000 -07:00</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="1022" class="output">├─╯  Create CONTRIBUTING.md
</tspan><tspan xml:space="preserve" x="10" y="1040" class="output">◉  <tspan class="bold fg5">o</tspan><tspan class="fg8">rrkosyo</tspan> <tspan class="fg3">octocat@nowhere.com</tspan> <tspan class="fg6">2012-03-06 15:06:50.000 -08:00</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">
</tspan><tspan xml:space="preserve" x="10" y="1112" class="output"><tspan class="fg2"># The most recent portion of the operation log</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1130" class="output"><tspan class="fg2"># is:</tspan>
</tspan><tspan xml:space="preserve" x="10" y="122" class="output">@  <tspan class="bold fg12">185753f764bf</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="140" class="output">│  <tspan class="bold">forget branch octocat-patch-1</tspan>
</tspan><tspan xml:space="preserve" x="10" y="158" class="output">│  <tspan class="bold fg5">args: jj branch forget octocat-patch-1</tspan>
</tspan><tspan xml:space="preserve" x="10" y="176" class="output">◉  <tspan class="fg4">110d41221fe6</tspan> <tspan class="fg3">jjfan@jujube</tspan> <tspan class="fg6">now, lasted less than a microsecond</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 octocat-patch-1</tspan>
</tspan><tspan xml:space="preserve" x="10" y="230" class="output">◉  <tspan class="fg4">107b52b37627</tspan> <tspan class="fg3">jjfan@jujube</tspan> <tspan class="fg6">now, lasted less than a microsecond</tspan>
</tspan><tspan xml:space="preserve" x="10" y="248" class="output">│  check out git remote's default branch
</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">abea1aadaeee</tspan> <tspan class="fg3">jjfan@jujube</tspan> <tspan class="fg6">now, lasted 410 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">e5b679e5ed3d</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 workspace 'default'
</tspan><tspan xml:space="preserve" x="10" y="374" class="output">◉  <tspan class="fg4">e65fdcb23853</tspan> <tspan class="fg3">jjfan@jujube</tspan> <tspan class="fg6">now, lasted less than a microsecond</tspan>
</tspan><tspan xml:space="preserve" x="10" y="392" class="output">   initialize repo
</tspan><tspan xml:space="preserve" x="10" y="410" class="output">
</tspan><tspan xml:space="preserve" x="10" y="428" class="output"><tspan class="fg2"># We are going to make some changes to show</tspan>
</tspan><tspan xml:space="preserve" x="10" y="446" class="output"><tspan class="fg2"># how the operation log works. Let's add a file, set</tspan>
</tspan><tspan xml:space="preserve" x="10" y="464" class="output"><tspan class="fg2"># a description, and rebase onto the "test" branch:</tspan>
</tspan><tspan xml:space="preserve" x="10" y="482" class="output">
</tspan><tspan xml:space="preserve" x="10" y="500" class="output">$ echo stuff &gt; new-file
</tspan><tspan xml:space="preserve" x="10" y="518" class="output">$ jj describe -m stuff
</tspan><tspan xml:space="preserve" x="10" y="536" class="output">Working copy now at: <tspan class="bold fg13">v</tspan><tspan class="bold fg8">wzqnovr</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">b7</tspan><tspan class="bold fg8">d38236</tspan><tspan class="bold"> stuff</tspan>
</tspan><tspan xml:space="preserve" x="10" y="554" 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="572" class="output">om Spaceghost/patch-1
</tspan><tspan xml:space="preserve" x="10" y="590" class="output">$ jj rebase -d test
</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">v</tspan><tspan class="bold fg8">wzqnovr</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">e</tspan><tspan class="bold fg8">ba2142d</tspan><tspan class="bold"> stuff</tspan>
</tspan><tspan xml:space="preserve" x="10" y="644" 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="662" class="output">Added 1 files, modified 0 files, removed 0 files
</tspan><tspan xml:space="preserve" x="10" y="680" class="output">
</tspan><tspan xml:space="preserve" x="10" y="698" class="output"><tspan class="fg2"># We are now going to make another change off of</tspan>
</tspan><tspan xml:space="preserve" x="10" y="716" class="output"><tspan class="fg2"># master:</tspan>
</tspan><tspan xml:space="preserve" x="10" y="734" class="output">
</tspan><tspan xml:space="preserve" x="10" y="752" class="output">$ jj co master
</tspan><tspan xml:space="preserve" x="10" y="770" class="output">Working copy now at: <tspan class="bold fg13">p</tspan><tspan class="bold fg8">nlnlkqn</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">4</tspan><tspan class="bold fg8">7b7ab30</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="788" 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="806" class="output">om Spaceghost/patch-1
</tspan><tspan xml:space="preserve" x="10" y="824" class="output">Added 0 files, modified 0 files, removed 2 files
</tspan><tspan xml:space="preserve" x="10" y="842" class="output">$ jj describe -m "other stuff"
</tspan><tspan xml:space="preserve" x="10" y="860" class="output">Working copy now at: <tspan class="bold fg13">p</tspan><tspan class="bold fg8">nlnlkqn</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">c</tspan><tspan class="bold fg8">6c396f6</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="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="914" class="output">
</tspan><tspan xml:space="preserve" x="10" y="932" class="output"><tspan class="fg2"># The repo now looks like this:</tspan>
</tspan><tspan xml:space="preserve" x="10" y="950" class="output">
</tspan><tspan xml:space="preserve" x="10" y="968" class="output">$ jj log
</tspan><tspan xml:space="preserve" x="10" y="986" class="output">@  <tspan class="bold fg13">p</tspan><tspan class="bold fg8">nlnlkqn</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@example.com</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">2023-10-03 17:53:27.000 -07:00</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">c</tspan><tspan class="bold fg8">6c396f6</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1004" class="output">│  <tspan class="bold fg10">(empty)</tspan><tspan class="bold"> other stuff</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1022" class="output">│ ◉  <tspan class="bold fg5">v</tspan><tspan class="fg8">wzqnovr</tspan> <tspan class="fg3">jjfan@example.com</tspan> <tspan class="fg6">2023-10-03 17:53:27.000 -07:00</tspan> <tspan class="bold fg4">e</tspan><tspan class="fg8">ba2142d</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1040" class="output">│ │  stuff
</tspan><tspan xml:space="preserve" x="10" y="1058" 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.000 -07:00</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="1076" class="output">├─╯  Create CONTRIBUTING.md
</tspan><tspan xml:space="preserve" x="10" y="1094" class="output">◉  <tspan class="bold fg5">o</tspan><tspan class="fg8">rrkosyo</tspan> <tspan class="fg3">octocat@nowhere.com</tspan> <tspan class="fg6">2012-03-06 15:06:50.000 -08:00</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">
</tspan><tspan xml:space="preserve" x="10" y="1166" class="output">$ jj op log --limit 4
</tspan><tspan xml:space="preserve" x="10" y="1184" class="output">@  <tspan class="bold fg12">0fac552f4f72</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@jujube</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">now, lasted 1 millisecond</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1202" class="output">│  <tspan class="bold">describe commit f18fb50012d764655037a7bb4cee0172691e5681</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1220" class="output">│  <tspan class="bold fg5">args: jj describe -m 'other stuff'</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1238" class="output">◉  <tspan class="fg4">dc729a65a24b</tspan> <tspan class="fg3">jjfan@jujube</tspan> <tspan class="fg6">now, lasted 1 millisecond</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1256" class="output">│  check out commit 7fd1a60b01f91b314f59955a4e4d4e80d8edf11d
</tspan><tspan xml:space="preserve" x="10" y="1274" class="output">│  <tspan class="fg5">args: jj co master</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1292" class="output">◉  <tspan class="fg4">99af13f4bea1</tspan> <tspan class="fg3">jjfan@jujube</tspan> <tspan class="fg6">now, lasted 1 millisecond</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1310" class="output">│  rebase commit ab94989ab0b20e569b934dcffba33e68ad780d2a and descendants
</tspan><tspan xml:space="preserve" x="10" y="1328" class="output">│  <tspan class="fg5">args: jj rebase -d test</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1346" class="output">◉  <tspan class="fg4">9cc7474d42a1</tspan> <tspan class="fg3">jjfan@jujube</tspan> <tspan class="fg6">now, lasted 1 millisecond</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1364" class="output">│  describe commit 47b41c1661fc8428b0f03641cab2b7a08c439e6c
</tspan><tspan xml:space="preserve" x="10" y="1382" class="output">│  <tspan class="fg5">args: jj describe -m stuff</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1400" class="output">
</tspan><tspan xml:space="preserve" x="10" y="1418" class="output"><tspan class="fg2"># Let's undo that rebase operation:</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1436" class="output">
</tspan><tspan xml:space="preserve" x="10" y="1454" class="output">$ jj undo 99af1
</tspan><tspan xml:space="preserve" x="10" y="1472" class="output">
</tspan><tspan xml:space="preserve" x="10" y="1490" class="output"><tspan class="fg2"># Note that only the rebase was undone, and the</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1508" class="output"><tspan class="fg2"># subsequent "other stuff" change was not undone:</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1166" class="output"><tspan class="fg2"># The most recent portion of the operation log</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1184" class="output"><tspan class="fg2"># is:</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1202" class="output">
</tspan><tspan xml:space="preserve" x="10" y="1220" class="output">$ jj op log --limit 4
</tspan><tspan xml:space="preserve" x="10" y="1238" class="output">@  <tspan class="bold fg12">d395e87c7fc6</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@jujube</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">now, lasted 1 millisecond</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1256" class="output">│  <tspan class="bold">describe commit 47b7ab301cbbb3273d5acd42db579594bc9f58b4</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1274" class="output">│  <tspan class="bold fg5">args: jj describe -m 'other stuff'</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1292" class="output">◉  <tspan class="fg4">4ec113b4994a</tspan> <tspan class="fg3">jjfan@jujube</tspan> <tspan class="fg6">now, lasted 1 millisecond</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1310" class="output">│  check out commit 7fd1a60b01f91b314f59955a4e4d4e80d8edf11d
</tspan><tspan xml:space="preserve" x="10" y="1328" class="output">│  <tspan class="fg5">args: jj co master</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1346" class="output">◉  <tspan class="fg4">781069b8c73d</tspan> <tspan class="fg3">jjfan@jujube</tspan> <tspan class="fg6">now, lasted 1 millisecond</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1364" class="output">│  rebase commit b7d38236713284f1a64c2f74ebe5e5e1655ff1b9 and descendants
</tspan><tspan xml:space="preserve" x="10" y="1382" class="output">│  <tspan class="fg5">args: jj rebase -d test</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1400" class="output">◉  <tspan class="fg4">4f6b60f68269</tspan> <tspan class="fg3">jjfan@jujube</tspan> <tspan class="fg6">now, lasted less than a microsecond</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1418" class="output">│  describe commit e2b262f6ab3a977fcedb58835cf8f87b3b4277cb
</tspan><tspan xml:space="preserve" x="10" y="1436" class="output">│  <tspan class="fg5">args: jj describe -m stuff</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1454" class="output">
</tspan><tspan xml:space="preserve" x="10" y="1472" class="output"><tspan class="fg2"># Let's undo that rebase operation:</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1490" class="output">
</tspan><tspan xml:space="preserve" x="10" y="1508" class="output">$ jj undo 78106
</tspan><tspan xml:space="preserve" x="10" y="1526" class="output">
</tspan><tspan xml:space="preserve" x="10" y="1544" class="output">$ jj log
</tspan><tspan xml:space="preserve" x="10" y="1562" class="output">@  <tspan class="bold fg13">y</tspan><tspan class="bold fg8">uknqtsx</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@example.com</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">2023-10-03 17:52:08.000 -07:00</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">1</tspan><tspan class="bold fg8">2e96f12</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1580" class="output">│  <tspan class="bold fg10">(empty)</tspan><tspan class="bold"> other stuff</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1598" class="output">│ ◉  <tspan class="bold fg5">s</tspan><tspan class="fg8">tlkvnrx</tspan> <tspan class="fg3">jjfan@example.com</tspan> <tspan class="fg6">2023-10-03 17:52:08.000 -07:00</tspan> <tspan class="bold fg4">a</tspan><tspan class="fg8">b94989a</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1616" class="output">├─╯  stuff
</tspan><tspan xml:space="preserve" x="10" y="1634" 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 12:55:19.000 -05:00</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1652" class="output">├─╯  <tspan class="fg5">octocat-patch-1</tspan> <tspan class="bold fg4">b1</tspan><tspan class="fg8">b3f972</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1670" class="output">│    sentence case
</tspan><tspan xml:space="preserve" x="10" y="1544" class="output"><tspan class="fg2"># Note that only the rebase was undone, and the</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1562" class="output"><tspan class="fg2"># subsequent "other stuff" change was not undone:</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1580" class="output">
</tspan><tspan xml:space="preserve" x="10" y="1598" class="output">$ jj log
</tspan><tspan xml:space="preserve" x="10" y="1616" class="output">@  <tspan class="bold fg13">p</tspan><tspan class="bold fg8">nlnlkqn</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@example.com</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">2023-10-03 17:53:27.000 -07:00</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">c</tspan><tspan class="bold fg8">6c396f6</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1634" class="output">│  <tspan class="bold fg10">(empty)</tspan><tspan class="bold"> other stuff</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1652" class="output">│ ◉  <tspan class="bold fg5">v</tspan><tspan class="fg8">wzqnovr</tspan> <tspan class="fg3">jjfan@example.com</tspan> <tspan class="fg6">2023-10-03 17:53:27.000 -07:00</tspan> <tspan class="bold fg4">b7</tspan><tspan class="fg8">d38236</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1670" class="output">├─╯  stuff
</tspan><tspan xml:space="preserve" x="10" y="1688" 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.000 -07:00</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="1706" class="output">├─╯  Create CONTRIBUTING.md
</tspan><tspan xml:space="preserve" x="10" y="1724" class="output">◉  <tspan class="bold fg5">o</tspan><tspan class="fg8">rrkosyo</tspan> <tspan class="fg3">octocat@nowhere.com</tspan> <tspan class="fg6">2012-03-06 15:06:50.000 -08:00</tspan> <tspan class="fg5">master</tspan> <tspan class="bold fg4">7</tspan><tspan class="fg8">fd1a60b</tspan>
@ -137,40 +137,34 @@
</tspan><tspan xml:space="preserve" x="10" y="1796" class="output"><tspan class="fg2"># We can also see what the repo looked like</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1814" class="output"><tspan class="fg2"># after the rebase operation:</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1832" class="output">
</tspan><tspan xml:space="preserve" x="10" y="1850" class="output">$ jj --at-op 99af1 log
</tspan><tspan xml:space="preserve" x="10" y="1868" class="output">@  <tspan class="bold fg13">s</tspan><tspan class="bold fg8">tlkvnrx</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@example.com</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">2023-10-03 17:52:08.000 -07:00</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">4</tspan><tspan class="bold fg8">7f07ef4</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1850" class="output">$ jj --at-op 78106 log
</tspan><tspan xml:space="preserve" x="10" y="1868" class="output">@  <tspan class="bold fg13">v</tspan><tspan class="bold fg8">wzqnovr</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@example.com</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">2023-10-03 17:53:27.000 -07:00</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">e</tspan><tspan class="bold fg8">ba2142d</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1886" class="output">│  <tspan class="bold">stuff</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1904" 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.000 -07:00</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="1904" 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.000 -07:00</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="1922" class="output">│  Create CONTRIBUTING.md
</tspan><tspan xml:space="preserve" x="10" y="1940" 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 12:55:19.000 -05:00</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1958" class="output">├─╯  <tspan class="fg5">octocat-patch-1</tspan> <tspan class="bold fg4">b1</tspan><tspan class="fg8">b3f972</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1976" class="output">│    sentence case
</tspan><tspan xml:space="preserve" x="10" y="1994" class="output">◉  <tspan class="bold fg5">o</tspan><tspan class="fg8">rrkosyo</tspan> <tspan class="fg3">octocat@nowhere.com</tspan> <tspan class="fg6">2012-03-06 15:06:50.000 -08:00</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="fg2">(empty)</tspan> Merge pull request #6 from Spaceghost/patch-1
</tspan><tspan xml:space="preserve" x="10" y="2030" class="output">~
</tspan><tspan xml:space="preserve" x="10" y="1940" class="output">◉  <tspan class="bold fg5">o</tspan><tspan class="fg8">rrkosyo</tspan> <tspan class="fg3">octocat@nowhere.com</tspan> <tspan class="fg6">2012-03-06 15:06:50.000 -08:00</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="1958" class="output">│  <tspan class="fg2">(empty)</tspan> Merge pull request #6 from Spaceghost/patch-1
</tspan><tspan xml:space="preserve" x="10" y="1976" class="output">~
</tspan><tspan xml:space="preserve" x="10" y="1994" class="output">
</tspan><tspan xml:space="preserve" x="10" y="2012" 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="2030" class="output"><tspan class="fg2"># state of the repo right after the rebase:</tspan>
</tspan><tspan xml:space="preserve" x="10" y="2048" class="output">
</tspan><tspan xml:space="preserve" x="10" y="2066" 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="2084" class="output"><tspan class="fg2"># state of the repo right after the rebase:</tspan>
</tspan><tspan xml:space="preserve" x="10" y="2102" class="output">
</tspan><tspan xml:space="preserve" x="10" y="2120" class="output">$ jj op restore 99af1
</tspan><tspan xml:space="preserve" x="10" y="2138" class="output">Working copy now at: <tspan class="bold fg13">s</tspan><tspan class="bold fg8">tlkvnrx</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">4</tspan><tspan class="bold fg8">7f07ef4</tspan><tspan class="bold"> stuff</tspan>
</tspan><tspan xml:space="preserve" x="10" y="2156" class="output">Parent commit      : <tspan class="bold fg5">k</tspan><tspan class="fg8">owxouwz</tspan> <tspan class="bold fg4">b3</tspan><tspan class="fg8">cbd5bb</tspan> <tspan class="fg5">test</tspan><tspan class="fg8"> | </tspan>Create CONTRIBUTING.md
</tspan><tspan xml:space="preserve" x="10" y="2174" class="output">Added 2 files, modified 0 files, removed 0 files
</tspan><tspan xml:space="preserve" x="10" y="2066" class="output">$ jj op restore 78106
</tspan><tspan xml:space="preserve" x="10" y="2084" class="output">Working copy now at: <tspan class="bold fg13">v</tspan><tspan class="bold fg8">wzqnovr</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">e</tspan><tspan class="bold fg8">ba2142d</tspan><tspan class="bold"> stuff</tspan>
</tspan><tspan xml:space="preserve" x="10" y="2102" 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="2120" class="output">Added 2 files, modified 0 files, removed 0 files
</tspan><tspan xml:space="preserve" x="10" y="2138" class="output">
</tspan><tspan xml:space="preserve" x="10" y="2156" class="output"><tspan class="fg2"># We're now back to before the "other stuff"</tspan>
</tspan><tspan xml:space="preserve" x="10" y="2174" class="output"><tspan class="fg2"># change existed:</tspan>
</tspan><tspan xml:space="preserve" x="10" y="2192" class="output">
</tspan><tspan xml:space="preserve" x="10" y="2210" class="output"><tspan class="fg2"># We're now back to before the "other stuff"</tspan>
</tspan><tspan xml:space="preserve" x="10" y="2228" class="output"><tspan class="fg2"># change existed:</tspan>
</tspan><tspan xml:space="preserve" x="10" y="2246" class="output">
</tspan><tspan xml:space="preserve" x="10" y="2264" class="output">$ jj log
</tspan><tspan xml:space="preserve" x="10" y="2282" class="output">@  <tspan class="bold fg13">s</tspan><tspan class="bold fg8">tlkvnrx</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@example.com</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">2023-10-03 17:52:08.000 -07:00</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">4</tspan><tspan class="bold fg8">7f07ef4</tspan>
</tspan><tspan xml:space="preserve" x="10" y="2300" class="output">│  <tspan class="bold">stuff</tspan>
</tspan><tspan xml:space="preserve" x="10" y="2318" 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.000 -07:00</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="2336" class="output">│  Create CONTRIBUTING.md
</tspan><tspan xml:space="preserve" x="10" y="2354" 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 12:55:19.000 -05:00</tspan>
</tspan><tspan xml:space="preserve" x="10" y="2372" class="output">├─╯  <tspan class="fg5">octocat-patch-1</tspan> <tspan class="bold fg4">b1</tspan><tspan class="fg8">b3f972</tspan>
</tspan><tspan xml:space="preserve" x="10" y="2390" class="output">│    sentence case
</tspan><tspan xml:space="preserve" x="10" y="2408" class="output">◉  <tspan class="bold fg5">o</tspan><tspan class="fg8">rrkosyo</tspan> <tspan class="fg3">octocat@nowhere.com</tspan> <tspan class="fg6">2012-03-06 15:06:50.000 -08:00</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><tspan xml:space="preserve" x="10" y="2210" class="output">$ jj log
</tspan><tspan xml:space="preserve" x="10" y="2228" class="output">@  <tspan class="bold fg13">v</tspan><tspan class="bold fg8">wzqnovr</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@example.com</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">2023-10-03 17:53:27.000 -07:00</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">e</tspan><tspan class="bold fg8">ba2142d</tspan>
</tspan><tspan xml:space="preserve" x="10" y="2246" class="output">│  <tspan class="bold">stuff</tspan>
</tspan><tspan xml:space="preserve" x="10" y="2264" 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.000 -07:00</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="2282" class="output">│  Create CONTRIBUTING.md
</tspan><tspan xml:space="preserve" x="10" y="2300" class="output">◉  <tspan class="bold fg5">o</tspan><tspan class="fg8">rrkosyo</tspan> <tspan class="fg3">octocat@nowhere.com</tspan> <tspan class="fg6">2012-03-06 15:06:50.000 -08:00</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="2318" class="output">│  <tspan class="fg2">(empty)</tspan> Merge pull request #6 from Spaceghost/patch-1
</tspan><tspan xml:space="preserve" x="10" y="2336" class="output">~
</tspan></text>
</svg>
</svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 24 KiB

After

Width:  |  Height:  |  Size: 23 KiB

166
demos/resolve_conflicts.svg
View File

@ -1,5 +1,5 @@
<!-- Created with term-transcript v0.3.0 (https://github.com/slowli/term-transcript) -->
<svg viewBox="0 0 720 1784" width="720" height="1784" xmlns="http://www.w3.org/2000/svg">
<svg viewBox="0 0 720 1532" width="720" height="1532" xmlns="http://www.w3.org/2000/svg">
<style>
.container {
font: 14px Fira Code, Liberation Mono, SFMono-Regular, Consolas, Menlo, monospace;
@ -33,106 +33,92 @@
.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="1764" viewBox="0 0 720 1764">
<svg x="0" y="10" width="720" height="1512" viewBox="0 0 720 1512">
<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</tspan>
</tspan><tspan xml:space="preserve" x="10" y="50" class="output"><tspan class="fg2"># octocat/Hello-World repo:</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 -r 'all()'
</tspan><tspan xml:space="preserve" x="10" y="104" class="output">@  <tspan class="bold fg13">n</tspan><tspan class="bold fg8">rtkvytr</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@example.com</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">2023-10-03 17:52:10.000 -07:00</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">5</tspan><tspan class="bold fg8">863a062</tspan>
</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 fg13">y</tspan><tspan class="bold fg8">nwsmqnv</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@example.com</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">2023-10-03 17:53:28.000 -07:00</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">7d</tspan><tspan class="bold fg8">1bd6e5</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">t</tspan><tspan class="fg8">pstlust</tspan> <tspan class="fg3">support+octocat@github.com</tspan> <tspan class="fg6">2018-05-10 12:55:19.000 -05:00</tspan>
</tspan><tspan xml:space="preserve" x="10" y="158" class="output">├─╯  <tspan class="fg5">octocat-patch-1</tspan> <tspan class="bold fg4">b1</tspan><tspan class="fg8">b3f972</tspan>
</tspan><tspan xml:space="preserve" x="10" y="158" class="output">├─╯  <tspan class="fg5">octocat-patch-1</tspan> <tspan class="bold fg4">b</tspan><tspan class="fg8">1b3f972</tspan>
</tspan><tspan xml:space="preserve" x="10" y="176" class="output">│    sentence case
</tspan><tspan xml:space="preserve" x="10" y="194" 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.000 -07:00</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="212" class="output">├─╯  Create CONTRIBUTING.md
</tspan><tspan xml:space="preserve" x="10" y="230" class="output">◉    <tspan class="bold fg5">o</tspan><tspan class="fg8">rrkosyo</tspan> <tspan class="fg3">octocat@nowhere.com</tspan> <tspan class="fg6">2012-03-06 15:06:50.000 -08:00</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="248" class="output">├─╮  <tspan class="fg2">(empty)</tspan> Merge pull request #6 from Spaceghost/patch-1
</tspan><tspan xml:space="preserve" x="10" y="266" class="output">│ ◉  <tspan class="bold fg5">nz</tspan><tspan class="fg8">nozkvv</tspan> <tspan class="fg3">Johnneylee.rollins@gmail.com</tspan> <tspan class="fg6">2011-09-13 21:42:41.000 -07:00</tspan>
</tspan><tspan xml:space="preserve" x="10" y="284" class="output">├─╯  <tspan class="bold fg4">76</tspan><tspan class="fg8">294131</tspan>
</tspan><tspan xml:space="preserve" x="10" y="302" class="output">│    New line at end of file. --Signed off by Spaceghost
</tspan><tspan xml:space="preserve" x="10" y="320" class="output">◉  <tspan class="bold fg5">s</tspan><tspan class="fg8">yktoqts</tspan> <tspan class="fg3">cameron@github.com</tspan> <tspan class="fg6">2011-01-26 11:06:08.000 -08:00</tspan> <tspan class="bold fg4">55</tspan><tspan class="fg8">3c2077</tspan>
</tspan><tspan xml:space="preserve" x="10" y="338" class="output">│  first commit
</tspan><tspan xml:space="preserve" x="10" y="356" class="output">◉  <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="374" class="output">
</tspan><tspan xml:space="preserve" x="10" y="392" class="output"><tspan class="fg2"># Let's make an edit that will conflict</tspan>
</tspan><tspan xml:space="preserve" x="10" y="410" class="output"><tspan class="fg2"># when we rebase it:</tspan>
</tspan><tspan xml:space="preserve" x="10" y="428" class="output">
</tspan><tspan xml:space="preserve" x="10" y="446" class="output">$ jj describe -m "README: say which world"
</tspan><tspan xml:space="preserve" x="10" y="464" class="output">Working copy now at: <tspan class="bold fg13">n</tspan><tspan class="bold fg8">rtkvytr</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">9</tspan><tspan class="bold fg8">c88f5a5</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="482" 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="500" class="output">om Spaceghost/patch-1
</tspan><tspan xml:space="preserve" x="10" y="518" class="output">$ echo "Hello Earth!" &gt; README
</tspan><tspan xml:space="preserve" x="10" y="536" class="output">$ jj diff
</tspan><tspan xml:space="preserve" x="10" y="194" class="output">◉  <tspan class="bold fg5">o</tspan><tspan class="fg8">rrkosyo</tspan> <tspan class="fg3">octocat@nowhere.com</tspan> <tspan class="fg6">2012-03-06 15:06:50.000 -08:00</tspan> <tspan class="fg5">master</tspan> <tspan class="bold fg4">7f</tspan><tspan class="fg8">d1a60b</tspan>
</tspan><tspan xml:space="preserve" x="10" y="212" class="output">│  <tspan class="fg2">(empty)</tspan> Merge pull request #6 from Spaceghost/patch-1
</tspan><tspan xml:space="preserve" x="10" y="230" class="output">~
</tspan><tspan xml:space="preserve" x="10" y="248" class="output">
</tspan><tspan xml:space="preserve" x="10" y="266" class="output"><tspan class="fg2"># Let's make an edit that will conflict</tspan>
</tspan><tspan xml:space="preserve" x="10" y="284" class="output"><tspan class="fg2"># when we rebase it:</tspan>
</tspan><tspan xml:space="preserve" x="10" y="302" class="output">
</tspan><tspan xml:space="preserve" x="10" y="320" class="output">$ jj describe -m "README: say which world"
</tspan><tspan xml:space="preserve" x="10" y="338" class="output">Working copy now at: <tspan class="bold fg13">y</tspan><tspan class="bold fg8">nwsmqnv</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">bf</tspan><tspan class="bold fg8">5b4633</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="356" 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="374" class="output">om Spaceghost/patch-1
</tspan><tspan xml:space="preserve" x="10" y="392" class="output">$ echo "Hello Earth!" &gt; README
</tspan><tspan xml:space="preserve" x="10" y="410" class="output">$ jj diff
</tspan><tspan xml:space="preserve" x="10" y="428" class="output"><tspan class="fg3">Modified regular file README:</tspan>
</tspan><tspan xml:space="preserve" x="10" y="446" class="output"><tspan class="fg1">   1</tspan> <tspan class="fg2">   1</tspan>: Hello <tspan class="fg1">World</tspan><tspan class="fg2">Earth</tspan>!
</tspan><tspan xml:space="preserve" x="10" y="464" class="output">
</tspan><tspan xml:space="preserve" x="10" y="482" class="output"><tspan class="fg2"># We're going to rebase it onto commit b1.</tspan>
</tspan><tspan xml:space="preserve" x="10" y="500" class="output"><tspan class="fg2"># That commit looks like this:</tspan>
</tspan><tspan xml:space="preserve" x="10" y="518" class="output">
</tspan><tspan xml:space="preserve" x="10" y="536" class="output">$ jj diff -r b1
</tspan><tspan xml:space="preserve" x="10" y="554" class="output"><tspan class="fg3">Modified regular file README:</tspan>
</tspan><tspan xml:space="preserve" x="10" y="572" class="output"><tspan class="fg1">   1</tspan> <tspan class="fg2">   1</tspan>: Hello <tspan class="fg1">World</tspan><tspan class="fg2">Earth</tspan>!
</tspan><tspan xml:space="preserve" x="10" y="572" class="output"><tspan class="fg1">   1</tspan> <tspan class="fg2">   1</tspan>: Hello <tspan class="fg1">World</tspan><tspan class="fg2">world</tspan>!
</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"># We're going to rebase it onto commit b1.</tspan>
</tspan><tspan xml:space="preserve" x="10" y="626" class="output"><tspan class="fg2"># That commit looks like this:</tspan>
</tspan><tspan xml:space="preserve" x="10" y="644" class="output">
</tspan><tspan xml:space="preserve" x="10" y="662" class="output">$ jj diff -r b1
</tspan><tspan xml:space="preserve" x="10" y="680" class="output"><tspan class="fg3">Modified regular file README:</tspan>
</tspan><tspan xml:space="preserve" x="10" y="698" class="output"><tspan class="fg1">   1</tspan> <tspan class="fg2">   1</tspan>: Hello <tspan class="fg1">World</tspan><tspan class="fg2">world</tspan>!
</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"># Now rebase:</tspan>
</tspan><tspan xml:space="preserve" x="10" y="752" class="output">
</tspan><tspan xml:space="preserve" x="10" y="770" class="output">$ jj rebase -d b1
</tspan><tspan xml:space="preserve" x="10" y="788" class="output">Rebased 1 commits
</tspan><tspan xml:space="preserve" x="10" y="806" class="output">Working copy now at: <tspan class="bold fg13">n</tspan><tspan class="bold fg8">rtkvytr</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">9</tspan><tspan class="bold fg8">333ce62</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="824" class="output">Parent commit      : <tspan class="bold fg5">t</tspan><tspan class="fg8">pstlust</tspan> <tspan class="bold fg4">b1</tspan><tspan class="fg8">b3f972</tspan> <tspan class="fg5">octocat-patch-1</tspan><tspan class="fg8"> | </tspan>sentence case
</tspan><tspan xml:space="preserve" x="10" y="842" class="output">Added 0 files, modified 1 files, removed 0 files
</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 -r 'all()'
</tspan><tspan xml:space="preserve" x="10" y="950" class="output">@  <tspan class="bold fg13">n</tspan><tspan class="bold fg8">rtkvytr</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@example.com</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">2023-10-03 17:52:10.000 -07:00</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">9</tspan><tspan class="bold fg8">333ce62</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 fg5">t</tspan><tspan class="fg8">pstlust</tspan> <tspan class="fg3">support+octocat@github.com</tspan> <tspan class="fg6">2018-05-10 12:55:19.000 -05:00</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1004" class="output">│  <tspan class="fg5">octocat-patch-1</tspan> <tspan class="bold fg4">b1</tspan><tspan class="fg8">b3f972</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 fg5">k</tspan><tspan class="fg8">owxouwz</tspan> <tspan class="fg3">octocat@nowhere.com</tspan> <tspan class="fg6">2014-06-10 15:22:26.000 -07:00</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="1058" class="output">├─╯  Create CONTRIBUTING.md
</tspan><tspan xml:space="preserve" x="10" y="1076" class="output">◉    <tspan class="bold fg5">o</tspan><tspan class="fg8">rrkosyo</tspan> <tspan class="fg3">octocat@nowhere.com</tspan> <tspan class="fg6">2012-03-06 15:06:50.000 -08:00</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="fg2">(empty)</tspan> Merge pull request #6 from Spaceghost/patch-1
</tspan><tspan xml:space="preserve" x="10" y="1112" class="output">│ ◉  <tspan class="bold fg5">nz</tspan><tspan class="fg8">nozkvv</tspan> <tspan class="fg3">Johnneylee.rollins@gmail.com</tspan> <tspan class="fg6">2011-09-13 21:42:41.000 -07:00</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1130" class="output">├─╯  <tspan class="bold fg4">76</tspan><tspan class="fg8">294131</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1148" class="output">│    New line at end of file. --Signed off by Spaceghost
</tspan><tspan xml:space="preserve" x="10" y="1166" class="output">◉  <tspan class="bold fg5">s</tspan><tspan class="fg8">yktoqts</tspan> <tspan class="fg3">cameron@github.com</tspan> <tspan class="fg6">2011-01-26 11:06:08.000 -08:00</tspan> <tspan class="bold fg4">55</tspan><tspan class="fg8">3c2077</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1184" class="output">│  first commit
</tspan><tspan xml:space="preserve" x="10" y="1202" class="output">◉  <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="1220" class="output">$ jj status
</tspan><tspan xml:space="preserve" x="10" y="1238" class="output">Working copy changes:
</tspan><tspan xml:space="preserve" x="10" y="1256" class="output"><tspan class="fg6">M README</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1274" class="output"><tspan class="fg1">There are unresolved conflicts at these paths:</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1292" class="output">README    <tspan class="fg3">2-sided conflict</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1310" class="output">Working copy : <tspan class="bold fg13">n</tspan><tspan class="bold fg8">rtkvytr</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">9</tspan><tspan class="bold fg8">333ce62</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="1328" class="output">Parent commit: <tspan class="bold fg5">t</tspan><tspan class="fg8">pstlust</tspan> <tspan class="bold fg4">b1</tspan><tspan class="fg8">b3f972</tspan> <tspan class="fg5">octocat-patch-1</tspan><tspan class="fg8"> | </tspan>sentence case
</tspan><tspan xml:space="preserve" x="10" y="608" class="output"><tspan class="fg2"># Now rebase:</tspan>
</tspan><tspan xml:space="preserve" x="10" y="626" class="output">
</tspan><tspan xml:space="preserve" x="10" y="644" class="output">$ jj rebase -d b1
</tspan><tspan xml:space="preserve" x="10" y="662" class="output">Rebased 1 commits
</tspan><tspan xml:space="preserve" x="10" y="680" class="output">Working copy now at: <tspan class="bold fg13">y</tspan><tspan class="bold fg8">nwsmqnv</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">73</tspan><tspan class="bold fg8">754cb4</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="698" 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</tspan><tspan class="fg8"> | </tspan>sentence case
</tspan><tspan xml:space="preserve" x="10" y="716" class="output">Added 0 files, modified 1 files, removed 0 files
</tspan><tspan xml:space="preserve" x="10" y="734" class="output">
</tspan><tspan xml:space="preserve" x="10" y="752" 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="770" class="output"><tspan class="fg2"># Let's take a look at the repo:</tspan>
</tspan><tspan xml:space="preserve" x="10" y="788" class="output">
</tspan><tspan xml:space="preserve" x="10" y="806" class="output">$ jj log
</tspan><tspan xml:space="preserve" x="10" y="824" class="output">@  <tspan class="bold fg13">y</tspan><tspan class="bold fg8">nwsmqnv</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@example.com</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">2023-10-03 17:53:28.000 -07:00</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">73</tspan><tspan class="bold fg8">754cb4</tspan><tspan class="bold"> </tspan><tspan class="bold fg9">conflict</tspan>
</tspan><tspan xml:space="preserve" x="10" y="842" class="output">│  <tspan class="bold">README: say which world</tspan>
</tspan><tspan xml:space="preserve" x="10" y="860" 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 12:55:19.000 -05:00</tspan>
</tspan><tspan xml:space="preserve" x="10" y="878" class="output">│  <tspan class="fg5">octocat-patch-1</tspan> <tspan class="bold fg4">b</tspan><tspan class="fg8">1b3f972</tspan>
</tspan><tspan xml:space="preserve" x="10" y="896" class="output">│  sentence case
</tspan><tspan xml:space="preserve" x="10" y="914" class="output">◉  <tspan class="bold fg5">o</tspan><tspan class="fg8">rrkosyo</tspan> <tspan class="fg3">octocat@nowhere.com</tspan> <tspan class="fg6">2012-03-06 15:06:50.000 -08:00</tspan> <tspan class="fg5">master</tspan> <tspan class="bold fg4">7f</tspan><tspan class="fg8">d1a60b</tspan>
</tspan><tspan xml:space="preserve" x="10" y="932" class="output">│  <tspan class="fg2">(empty)</tspan> Merge pull request #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">$ jj status
</tspan><tspan xml:space="preserve" x="10" y="986" class="output">Working copy changes:
</tspan><tspan xml:space="preserve" x="10" y="1004" class="output"><tspan class="fg6">M README</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1022" class="output"><tspan class="fg1">There are unresolved conflicts at these paths:</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1040" class="output">README    <tspan class="fg3">2-sided conflict</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1058" class="output">Working copy : <tspan class="bold fg13">y</tspan><tspan class="bold fg8">nwsmqnv</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">73</tspan><tspan class="bold fg8">754cb4</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="1076" 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</tspan><tspan class="fg8"> | </tspan>sentence case
</tspan><tspan xml:space="preserve" x="10" y="1094" class="output">
</tspan><tspan xml:space="preserve" x="10" y="1112" class="output"><tspan class="fg2"># Indeed, the rebased commit has a conflict. The conflicted file</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1130" class="output"><tspan class="fg2"># in the working copy looks like this:</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1148" class="output">
</tspan><tspan xml:space="preserve" x="10" y="1166" class="output">$ cat README
</tspan><tspan xml:space="preserve" x="10" y="1184" class="output">&lt;&lt;&lt;&lt;&lt;&lt;&lt;
</tspan><tspan xml:space="preserve" x="10" y="1202" class="output">%%%%%%%
</tspan><tspan xml:space="preserve" x="10" y="1220" class="output">-Hello World!
</tspan><tspan xml:space="preserve" x="10" y="1238" class="output">+Hello world!
</tspan><tspan xml:space="preserve" x="10" y="1256" class="output">+++++++
</tspan><tspan xml:space="preserve" x="10" y="1274" class="output">Hello Earth!
</tspan><tspan xml:space="preserve" x="10" y="1292" class="output">&gt;&gt;&gt;&gt;&gt;&gt;&gt;
</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"># Now we will resolve the conflict:</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"># Indeed, the rebased commit has a conflict. The conflicted file</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1382" class="output"><tspan class="fg2"># in the working copy looks like this:</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1400" class="output">
</tspan><tspan xml:space="preserve" x="10" y="1418" class="output">$ cat README
</tspan><tspan xml:space="preserve" x="10" y="1436" class="output">&lt;&lt;&lt;&lt;&lt;&lt;&lt;
</tspan><tspan xml:space="preserve" x="10" y="1454" class="output">%%%%%%%
</tspan><tspan xml:space="preserve" x="10" y="1472" class="output">-Hello World!
</tspan><tspan xml:space="preserve" x="10" y="1490" class="output">+Hello world!
</tspan><tspan xml:space="preserve" x="10" y="1508" class="output">+++++++
</tspan><tspan xml:space="preserve" x="10" y="1526" class="output">Hello Earth!
</tspan><tspan xml:space="preserve" x="10" y="1544" class="output">&gt;&gt;&gt;&gt;&gt;&gt;&gt;
</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"># Now we will resolve the conflict:</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1598" class="output">
</tspan><tspan xml:space="preserve" x="10" y="1616" class="output">$ echo "Hello earth!" &gt; README
</tspan><tspan xml:space="preserve" x="10" y="1634" class="output">
</tspan><tspan xml:space="preserve" x="10" y="1652" class="output"><tspan class="fg2"># The status command no longer reports it:</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1670" class="output">
</tspan><tspan xml:space="preserve" x="10" y="1688" class="output">$ jj status
</tspan><tspan xml:space="preserve" x="10" y="1706" class="output">Working copy changes:
</tspan><tspan xml:space="preserve" x="10" y="1724" class="output"><tspan class="fg6">M README</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1742" class="output">Working copy : <tspan class="bold fg13">n</tspan><tspan class="bold fg8">rtkvytr</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">d</tspan><tspan class="bold fg8">b55fbbe</tspan><tspan class="bold"> README: say which world</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1760" class="output">Parent commit: <tspan class="bold fg5">t</tspan><tspan class="fg8">pstlust</tspan> <tspan class="bold fg4">b1</tspan><tspan class="fg8">b3f972</tspan> <tspan class="fg5">octocat-patch-1</tspan><tspan class="fg8"> | </tspan>sentence case
</tspan><tspan xml:space="preserve" x="10" y="1364" class="output">$ echo "Hello earth!" &gt; README
</tspan><tspan xml:space="preserve" x="10" y="1382" class="output">
</tspan><tspan xml:space="preserve" x="10" y="1400" class="output"><tspan class="fg2"># The status command no longer reports it:</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1418" class="output">
</tspan><tspan xml:space="preserve" x="10" y="1436" class="output">$ jj status
</tspan><tspan xml:space="preserve" x="10" y="1454" class="output">Working copy changes:
</tspan><tspan xml:space="preserve" x="10" y="1472" class="output"><tspan class="fg6">M README</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1490" class="output">Working copy : <tspan class="bold fg13">y</tspan><tspan class="bold fg8">nwsmqnv</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">f</tspan><tspan class="bold fg8">d4a85d0</tspan><tspan class="bold"> README: say which world</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1508" 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</tspan><tspan class="fg8"> | </tspan>sentence case
</tspan></text>
</svg>
</svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 14 KiB

214
demos/working_copy.svg
View File

@ -1,5 +1,5 @@
<!-- Created with term-transcript v0.3.0 (https://github.com/slowli/term-transcript) -->
<svg viewBox="0 0 720 2234" width="720" height="2234" xmlns="http://www.w3.org/2000/svg">
<svg viewBox="0 0 720 1874" width="720" height="1874" xmlns="http://www.w3.org/2000/svg">
<style>
.container {
font: 14px Fira Code, Liberation Mono, SFMono-Regular, Consolas, Menlo, monospace;
@ -33,131 +33,111 @@
.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="2214" viewBox="0 0 720 2214">
<svg x="0" y="10" width="720" height="1854" viewBox="0 0 720 1854">
<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 in the octocat/Hello-World repo.</tspan>
</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 fg13">v</tspan><tspan class="bold fg8">qulumvq</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@example.com</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">2023-10-03 17:52:11.000 -07:00</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">5</tspan><tspan class="bold fg8">8432c48</tspan>
</tspan><tspan xml:space="preserve" x="10" y="104" class="output">@  <tspan class="bold fg13">l</tspan><tspan class="bold fg8">qwsnlyv</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@example.com</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">2023-10-03 17:53:29.000 -07:00</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">9</tspan><tspan class="bold fg8">fe8faea</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">t</tspan><tspan class="fg8">pstlust</tspan> <tspan class="fg3">support+octocat@github.com</tspan> <tspan class="fg6">2018-05-10 12:55:19.000 -05:00</tspan>
</tspan><tspan xml:space="preserve" x="10" y="158" class="output">├─╯  <tspan class="fg5">octocat-patch-1</tspan> <tspan class="bold fg4">b1</tspan><tspan class="fg8">b3f972</tspan>
</tspan><tspan xml:space="preserve" x="10" y="176" class="output">│    sentence case
</tspan><tspan xml:space="preserve" x="10" y="194" 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.000 -07:00</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="212" class="output">├─╯  Create CONTRIBUTING.md
</tspan><tspan xml:space="preserve" x="10" y="230" class="output">◉  <tspan class="bold fg5">o</tspan><tspan class="fg8">rrkosyo</tspan> <tspan class="fg3">octocat@nowhere.com</tspan> <tspan class="fg6">2012-03-06 15:06:50.000 -08:00</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="248" class="output">│  <tspan class="fg2">(empty)</tspan> Merge pull request #6 from Spaceghost/patch-1
</tspan><tspan xml:space="preserve" x="10" y="266" class="output">~
</tspan><tspan xml:space="preserve" x="10" y="284" class="output">$ jj status
</tspan><tspan xml:space="preserve" x="10" y="302" class="output">The working copy is clean
</tspan><tspan xml:space="preserve" x="10" y="320" class="output">Working copy : <tspan class="bold fg13">v</tspan><tspan class="bold fg8">qulumvq</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">5</tspan><tspan class="bold fg8">8432c48</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="338" 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="356" class="output">ceghost/patch-1
</tspan><tspan xml:space="preserve" x="10" y="140" class="output">◉  <tspan class="bold fg5">o</tspan><tspan class="fg8">rrkosyo</tspan> <tspan class="fg3">octocat@nowhere.com</tspan> <tspan class="fg6">2012-03-06 15:06:50.000 -08:00</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">l</tspan><tspan class="bold fg8">qwsnlyv</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">9</tspan><tspan class="bold fg8">fe8faea</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="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">
</tspan><tspan xml:space="preserve" x="10" y="338" class="output">$ echo "Goodbye World!" &gt; README
</tspan><tspan xml:space="preserve" x="10" y="356" class="output">$ echo stuff &gt; new-file
</tspan><tspan xml:space="preserve" x="10" y="374" class="output">
</tspan><tspan xml:space="preserve" x="10" y="392" class="output"><tspan class="fg2"># Now make some changes in the working copy:</tspan>
</tspan><tspan xml:space="preserve" x="10" y="410" class="output">
</tspan><tspan xml:space="preserve" x="10" y="428" class="output">$ echo "Goodbye World!" &gt; README
</tspan><tspan xml:space="preserve" x="10" y="446" class="output">$ echo stuff &gt; new-file
</tspan><tspan xml:space="preserve" x="10" y="464" class="output">
</tspan><tspan xml:space="preserve" x="10" y="482" class="output"><tspan class="fg2"># Because of these changes, our working copy is no longer marked as "(empty)".</tspan>
</tspan><tspan xml:space="preserve" x="10" y="500" class="output"><tspan class="fg2"># Also, its commit ID (starting with a blue character) changed:</tspan>
</tspan><tspan xml:space="preserve" x="10" y="518" class="output">
</tspan><tspan xml:space="preserve" x="10" y="536" class="output">$ jj status
</tspan><tspan xml:space="preserve" x="10" y="554" class="output">Working copy changes:
</tspan><tspan xml:space="preserve" x="10" y="572" class="output"><tspan class="fg6">M README</tspan>
</tspan><tspan xml:space="preserve" x="10" y="590" class="output"><tspan class="fg2">A new-file</tspan>
</tspan><tspan xml:space="preserve" x="10" y="608" class="output">Working copy : <tspan class="bold fg13">v</tspan><tspan class="bold fg8">qulumvq</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">2</tspan><tspan class="bold fg8">5610674</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">(no description set)</tspan>
</tspan><tspan xml:space="preserve" x="10" y="626" 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="644" class="output">ceghost/patch-1
</tspan><tspan xml:space="preserve" x="10" y="662" class="output">
</tspan><tspan xml:space="preserve" x="10" y="680" class="output"><tspan class="fg2"># Add a branch so we can easily refer to this</tspan>
</tspan><tspan xml:space="preserve" x="10" y="698" class="output"><tspan class="fg2"># commit:</tspan>
</tspan><tspan xml:space="preserve" x="10" y="716" class="output">
</tspan><tspan xml:space="preserve" x="10" y="734" class="output">$ jj branch create goodbye
</tspan><tspan xml:space="preserve" x="10" y="752" class="output">$ jj log
</tspan><tspan xml:space="preserve" x="10" y="770" class="output">@  <tspan class="bold fg13">v</tspan><tspan class="bold fg8">qulumvq</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@example.com</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">2023-10-03 17:52:11.000 -07:00</tspan><tspan class="bold"> </tspan><tspan class="bold fg13">goodbye</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">2</tspan><tspan class="bold fg8">5610674</tspan>
</tspan><tspan xml:space="preserve" x="10" y="788" class="output">│  <tspan class="bold fg3">(no description set)</tspan>
</tspan><tspan xml:space="preserve" x="10" y="806" 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 12:55:19.000 -05:00</tspan>
</tspan><tspan xml:space="preserve" x="10" y="824" class="output">├─╯  <tspan class="fg5">octocat-patch-1</tspan> <tspan class="bold fg4">b1</tspan><tspan class="fg8">b3f972</tspan>
</tspan><tspan xml:space="preserve" x="10" y="842" class="output">│    sentence case
</tspan><tspan xml:space="preserve" x="10" y="860" 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.000 -07:00</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="878" class="output">├─╯  Create CONTRIBUTING.md
</tspan><tspan xml:space="preserve" x="10" y="896" class="output">◉  <tspan class="bold fg5">o</tspan><tspan class="fg8">rrkosyo</tspan> <tspan class="fg3">octocat@nowhere.com</tspan> <tspan class="fg6">2012-03-06 15:06:50.000 -08:00</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="914" class="output">│  <tspan class="fg2">(empty)</tspan> Merge pull request #6 from Spaceghost/patch-1
</tspan><tspan xml:space="preserve" x="10" y="932" class="output">~
</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"># Start working on a new change off of master:</tspan>
</tspan><tspan xml:space="preserve" x="10" y="986" class="output">
</tspan><tspan xml:space="preserve" x="10" y="1004" class="output">$ jj co master
</tspan><tspan xml:space="preserve" x="10" y="1022" class="output">Working copy now at: <tspan class="bold fg13">tq</tspan><tspan class="bold fg8">wqmnqp</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">e</tspan><tspan class="bold fg8">5047385</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="1040" 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="1058" class="output">om Spaceghost/patch-1
</tspan><tspan xml:space="preserve" x="10" y="1076" class="output">Added 0 files, modified 1 files, removed 1 files
</tspan><tspan xml:space="preserve" x="10" y="1094" class="output">
</tspan><tspan xml:space="preserve" x="10" y="1112" 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="1130" class="output"><tspan class="fg2"># "goodbye" change stayed in its own commit:</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1148" class="output">
</tspan><tspan xml:space="preserve" x="10" y="1166" class="output">$ jj log
</tspan><tspan xml:space="preserve" x="10" y="1184" class="output">@  <tspan class="bold fg13">tq</tspan><tspan class="bold fg8">wqmnqp</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@example.com</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">2023-10-03 17:52:10.000 -07:00</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">e</tspan><tspan class="bold fg8">5047385</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1202" 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="1220" class="output">│ ◉  <tspan class="bold fg5">v</tspan><tspan class="fg8">qulumvq</tspan> <tspan class="fg3">jjfan@example.com</tspan> <tspan class="fg6">2023-10-03 17:52:11.000 -07:00</tspan> <tspan class="fg5">goodbye</tspan> <tspan class="bold fg4">2</tspan><tspan class="fg8">5610674</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1238" class="output">├─╯  <tspan class="fg3">(no description set)</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1256" class="output">│ ◉  <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 12:55:19.000 -05:00</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1274" class="output">├─╯  <tspan class="fg5">octocat-patch-1</tspan> <tspan class="bold fg4">b1</tspan><tspan class="fg8">b3f972</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1292" class="output">│    sentence case
</tspan><tspan xml:space="preserve" x="10" y="1310" 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.000 -07:00</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="1328" class="output">├─╯  Create CONTRIBUTING.md
</tspan><tspan xml:space="preserve" x="10" y="1346" class="output">◉  <tspan class="bold fg5">o</tspan><tspan class="fg8">rrkosyo</tspan> <tspan class="fg3">octocat@nowhere.com</tspan> <tspan class="fg6">2012-03-06 15:06:50.000 -08:00</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="1364" class="output">│  <tspan class="fg2">(empty)</tspan> Merge pull request #6 from Spaceghost/patch-1
</tspan><tspan xml:space="preserve" x="10" y="1382" class="output">~
</tspan><tspan xml:space="preserve" x="10" y="1400" class="output">
</tspan><tspan xml:space="preserve" x="10" y="1418" class="output"><tspan class="fg2"># Let's do a sanity check: 'jj status' should tell us that</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1436" class="output"><tspan class="fg2"># the working copy is clean.</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1454" class="output">
</tspan><tspan xml:space="preserve" x="10" y="1472" class="output">$ jj status
</tspan><tspan xml:space="preserve" x="10" y="1490" class="output">The working copy is clean
</tspan><tspan xml:space="preserve" x="10" y="1508" class="output">Working copy : <tspan class="bold fg13">tq</tspan><tspan class="bold fg8">wqmnqp</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">e</tspan><tspan class="bold fg8">5047385</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="1526" 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="1544" class="output">ceghost/patch-1
</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"># Modify a file in this new change:</tspan>
</tspan><tspan xml:space="preserve" x="10" y="392" class="output"><tspan class="fg2"># Because of these changes, our working copy is no longer marked as "(empty)".</tspan>
</tspan><tspan xml:space="preserve" x="10" y="410" class="output"><tspan class="fg2"># Also, its commit ID (starting with a blue character) changed:</tspan>
</tspan><tspan xml:space="preserve" x="10" y="428" class="output">
</tspan><tspan xml:space="preserve" x="10" y="446" class="output">$ jj status
</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">l</tspan><tspan class="bold fg8">qwsnlyv</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">c</tspan><tspan class="bold fg8">3038a2f</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="572" class="output">
</tspan><tspan xml:space="preserve" x="10" y="590" class="output"><tspan class="fg2"># Add a branch 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 branch create goodbye
</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 fg13">l</tspan><tspan class="bold fg8">qwsnlyv</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@example.com</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">2023-10-03 17:53:30.000 -07:00</tspan><tspan class="bold"> </tspan><tspan class="bold fg13">goodbye</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">c</tspan><tspan class="bold fg8">3038a2f</tspan>
</tspan><tspan xml:space="preserve" x="10" y="698" class="output">│  <tspan class="bold fg3">(no description set)</tspan>
</tspan><tspan xml:space="preserve" x="10" y="716" class="output">◉  <tspan class="bold fg5">o</tspan><tspan class="fg8">rrkosyo</tspan> <tspan class="fg3">octocat@nowhere.com</tspan> <tspan class="fg6">2012-03-06 15:06:50.000 -08:00</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="fg2">(empty)</tspan> Merge pull request #6 from Spaceghost/patch-1
</tspan><tspan xml:space="preserve" x="10" y="752" class="output">~
</tspan><tspan xml:space="preserve" x="10" y="770" class="output">
</tspan><tspan xml:space="preserve" x="10" y="788" class="output"><tspan class="fg2"># Start working on a new change off of master:</tspan>
</tspan><tspan xml:space="preserve" x="10" y="806" class="output">
</tspan><tspan xml:space="preserve" x="10" y="824" class="output">$ jj co master
</tspan><tspan xml:space="preserve" x="10" y="842" class="output">Working copy now at: <tspan class="bold fg13">p</tspan><tspan class="bold fg8">pvvsuyx</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">cb</tspan><tspan class="bold fg8">71a202</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="860" 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="878" class="output">om Spaceghost/patch-1
</tspan><tspan xml:space="preserve" x="10" y="896" class="output">Added 0 files, modified 1 files, removed 1 files
</tspan><tspan xml:space="preserve" x="10" y="914" class="output">
</tspan><tspan xml:space="preserve" x="10" y="932" 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="950" class="output"><tspan class="fg2"># "goodbye" change stayed in its own commit:</tspan>
</tspan><tspan xml:space="preserve" x="10" y="968" class="output">
</tspan><tspan xml:space="preserve" x="10" y="986" class="output">$ jj log
</tspan><tspan xml:space="preserve" x="10" y="1004" class="output">@  <tspan class="bold fg13">p</tspan><tspan class="bold fg8">pvvsuyx</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@example.com</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">2023-10-03 17:53:30.000 -07:00</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">cb</tspan><tspan class="bold fg8">71a202</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1022" 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="1040" class="output">│ ◉  <tspan class="bold fg5">l</tspan><tspan class="fg8">qwsnlyv</tspan> <tspan class="fg3">jjfan@example.com</tspan> <tspan class="fg6">2023-10-03 17:53:30.000 -07:00</tspan> <tspan class="fg5">goodbye</tspan> <tspan class="bold fg4">c3</tspan><tspan class="fg8">038a2f</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1058" class="output">├─╯  <tspan class="fg3">(no description set)</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1076" class="output">◉  <tspan class="bold fg5">o</tspan><tspan class="fg8">rrkosyo</tspan> <tspan class="fg3">octocat@nowhere.com</tspan> <tspan class="fg6">2012-03-06 15:06:50.000 -08:00</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="fg2">(empty)</tspan> Merge pull request #6 from Spaceghost/patch-1
</tspan><tspan xml:space="preserve" x="10" y="1112" class="output">~
</tspan><tspan xml:space="preserve" x="10" y="1130" class="output">
</tspan><tspan xml:space="preserve" x="10" y="1148" class="output"><tspan class="fg2"># Let's do a sanity check: 'jj status' should tell us that</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1166" class="output"><tspan class="fg2"># the working copy is clean.</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1184" class="output">
</tspan><tspan xml:space="preserve" x="10" y="1202" class="output">$ jj status
</tspan><tspan xml:space="preserve" x="10" y="1220" class="output">The working copy is clean
</tspan><tspan xml:space="preserve" x="10" y="1238" class="output">Working copy : <tspan class="bold fg13">p</tspan><tspan class="bold fg8">pvvsuyx</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">cb</tspan><tspan class="bold fg8">71a202</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="1256" 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="1274" class="output">ceghost/patch-1
</tspan><tspan xml:space="preserve" x="10" y="1292" class="output">
</tspan><tspan xml:space="preserve" x="10" y="1310" class="output"><tspan class="fg2"># Modify a file in this new change:</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1328" class="output">
</tspan><tspan xml:space="preserve" x="10" y="1346" class="output">$ echo "Hello everyone!" &gt; README
</tspan><tspan xml:space="preserve" x="10" y="1364" class="output">$ jj status
</tspan><tspan xml:space="preserve" x="10" y="1382" class="output">Working copy changes:
</tspan><tspan xml:space="preserve" x="10" y="1400" class="output"><tspan class="fg6">M README</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1418" class="output">Working copy : <tspan class="bold fg13">p</tspan><tspan class="bold fg8">pvvsuyx</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">4</tspan><tspan class="bold fg8">04f6fd1</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">(no description set)</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1436" 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="1454" class="output">ceghost/patch-1
</tspan><tspan xml:space="preserve" x="10" y="1472" class="output">
</tspan><tspan xml:space="preserve" x="10" y="1490" class="output"><tspan class="fg2"># The working copy is not special; we can, for</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1508" class="output"><tspan class="fg2"># example, set the description of any commit.</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1526" class="output"><tspan class="fg2"># First, set it on the working copy:</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1544" class="output">
</tspan><tspan xml:space="preserve" x="10" y="1562" class="output">$ jj describe -m everyone
</tspan><tspan xml:space="preserve" x="10" y="1580" class="output"><tspan class="fg8">... (output redacted) ...</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1598" class="output">
</tspan><tspan xml:space="preserve" x="10" y="1616" class="output">$ echo "Hello everyone!" &gt; README
</tspan><tspan xml:space="preserve" x="10" y="1634" class="output">$ jj status
</tspan><tspan xml:space="preserve" x="10" y="1652" class="output">Working copy changes:
</tspan><tspan xml:space="preserve" x="10" y="1670" class="output"><tspan class="fg6">M README</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1688" class="output">Working copy : <tspan class="bold fg13">tq</tspan><tspan class="bold fg8">wqmnqp</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">e</tspan><tspan class="bold fg8">2f75adb</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">(no description set)</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1706" 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="1724" class="output">ceghost/patch-1
</tspan><tspan xml:space="preserve" x="10" y="1742" class="output">
</tspan><tspan xml:space="preserve" x="10" y="1760" class="output"><tspan class="fg2"># The working copy is not special; we can, for</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1778" class="output"><tspan class="fg2"># example, set the description of any commit.</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1796" class="output"><tspan class="fg2"># First, set it on the working copy:</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1814" class="output">
</tspan><tspan xml:space="preserve" x="10" y="1832" class="output">$ jj describe -m everyone
</tspan><tspan xml:space="preserve" x="10" y="1850" class="output"><tspan class="fg8">... (output redacted) ...</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1868" class="output">
</tspan><tspan xml:space="preserve" x="10" y="1886" class="output"><tspan class="fg2"># Now set it on the change we worked on before:</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1904" class="output">
</tspan><tspan xml:space="preserve" x="10" y="1922" class="output">$ jj describe goodbye -m goodbye
</tspan><tspan xml:space="preserve" x="10" y="1940" class="output">
</tspan><tspan xml:space="preserve" x="10" y="1958" class="output"><tspan class="fg2"># Inspect the result:</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1976" class="output">
</tspan><tspan xml:space="preserve" x="10" y="1994" class="output">$ jj log
</tspan><tspan xml:space="preserve" x="10" y="2012" class="output">◉  <tspan class="bold fg5">v</tspan><tspan class="fg8">qulumvq</tspan> <tspan class="fg3">jjfan@example.com</tspan> <tspan class="fg6">2023-10-03 17:52:11.000 -07:00</tspan> <tspan class="fg5">goodbye</tspan> <tspan class="bold fg4">a</tspan><tspan class="fg8">cfe0ad3</tspan>
</tspan><tspan xml:space="preserve" x="10" y="2030" class="output">│  goodbye
</tspan><tspan xml:space="preserve" x="10" y="2048" class="output">│ @  <tspan class="bold fg13">tq</tspan><tspan class="bold fg8">wqmnqp</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@example.com</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">2023-10-03 17:52:11.000 -07:00</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">7d</tspan><tspan class="bold fg8">1af3d0</tspan>
</tspan><tspan xml:space="preserve" x="10" y="2066" class="output">├─╯  <tspan class="bold">everyone</tspan>
</tspan><tspan xml:space="preserve" x="10" y="2084" class="output">│ ◉  <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 12:55:19.000 -05:00</tspan>
</tspan><tspan xml:space="preserve" x="10" y="2102" class="output">├─╯  <tspan class="fg5">octocat-patch-1</tspan> <tspan class="bold fg4">b1</tspan><tspan class="fg8">b3f972</tspan>
</tspan><tspan xml:space="preserve" x="10" y="2120" class="output">│    sentence case
</tspan><tspan xml:space="preserve" x="10" y="2138" 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.000 -07:00</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="2156" class="output">├─╯  Create CONTRIBUTING.md
</tspan><tspan xml:space="preserve" x="10" y="2174" class="output">◉  <tspan class="bold fg5">o</tspan><tspan class="fg8">rrkosyo</tspan> <tspan class="fg3">octocat@nowhere.com</tspan> <tspan class="fg6">2012-03-06 15:06:50.000 -08:00</tspan> <tspan class="fg5">master</tspan> <tspan class="bold fg4">7f</tspan><tspan class="fg8">d1a60b</tspan>
</tspan><tspan xml:space="preserve" x="10" y="2192" class="output">│  <tspan class="fg2">(empty)</tspan> Merge pull request #6 from Spaceghost/patch-1
</tspan><tspan xml:space="preserve" x="10" y="2210" class="output">~
</tspan><tspan xml:space="preserve" x="10" y="1616" class="output"><tspan class="fg2"># Now set it on the change we worked on before:</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1634" class="output">
</tspan><tspan xml:space="preserve" x="10" y="1652" class="output">$ jj describe goodbye -m goodbye
</tspan><tspan xml:space="preserve" x="10" y="1670" class="output">
</tspan><tspan xml:space="preserve" x="10" y="1688" class="output"><tspan class="fg2"># Inspect the result:</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1706" class="output">
</tspan><tspan xml:space="preserve" x="10" y="1724" class="output">$ jj log
</tspan><tspan xml:space="preserve" x="10" y="1742" class="output">◉  <tspan class="bold fg5">l</tspan><tspan class="fg8">qwsnlyv</tspan> <tspan class="fg3">jjfan@example.com</tspan> <tspan class="fg6">2023-10-03 17:53:30.000 -07:00</tspan> <tspan class="fg5">goodbye</tspan> <tspan class="bold fg4">d</tspan><tspan class="fg8">173a31f</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1760" class="output">│  goodbye
</tspan><tspan xml:space="preserve" x="10" y="1778" class="output">│ @  <tspan class="bold fg13">p</tspan><tspan class="bold fg8">pvvsuyx</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@example.com</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">2023-10-03 17:53:30.000 -07:00</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">0</tspan><tspan class="bold fg8">bfedc93</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1796" class="output">├─╯  <tspan class="bold">everyone</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1814" class="output">◉  <tspan class="bold fg5">o</tspan><tspan class="fg8">rrkosyo</tspan> <tspan class="fg3">octocat@nowhere.com</tspan> <tspan class="fg6">2012-03-06 15:06:50.000 -08:00</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="1832" class="output">│  <tspan class="fg2">(empty)</tspan> Merge pull request #6 from Spaceghost/patch-1
</tspan><tspan xml:space="preserve" x="10" y="1850" class="output">~
</tspan></text>
</svg>
</svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 22 KiB

After

Width:  |  Height:  |  Size: 18 KiB