cybercyst/jj
1
0
Fork 0
mirror of https://github.com/martinvonz/jj.git synced 2025-05-05 23:42:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

demos: update, replace branch with bookmark

Browse Source 
The replacement is not purely mechanical, some text is also adjusted to
talk about bookmarks.
This commit is contained in:
Ilya Grigoriev 2024-09-29 14:01:37 -07:00
parent d2667c52ec
commit 5dab5e1ce6
15 changed files with 204 additions and 202 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
demos/demo_git_compat.sh
View File

@ -10,12 +10,12 @@ run_command "cd Hello-World"
blank blank
comment "By default, \"jj\" creates a local master branch tracking the remote master comment "By default, \"jj\" creates a local bookmark \"master\" tracking the remote master
branch. The other branches are only available as remote-tracking branches." branch. Other remote branches are only available as remote-tracking bookmarks."
run_command "jj branch list --all" run_command "jj bookmark list --all"
comment "We can create a local branch tracking one of the remote branches we just comment "We can create a local bookmark tracking one of the remote branches we just
fetched." fetched."
run_command "jj branch track octocat-patch-1@origin" run_command "jj bookmark track octocat-patch-1@origin"
comment "By default, \"jj log\" excludes untracked remote branches to focus on comment "By default, \"jj log\" excludes untracked remote branches to focus on
\"our\" commits." \"our\" commits."

6
demos/demo_juggle_conflicts.sh
View File

@ -6,13 +6,13 @@ new_tmp_dir
( (
jj init --config-toml ui.allow-init-native=true jj init --config-toml ui.allow-init-native=true
echo "first" > file echo "first" > file
jj branch create first jj bookmark create first
jj commit -m 'first' jj commit -m 'first'
echo "second" > file echo "second" > file
jj branch create second jj bookmark create second
jj commit -m 'second' jj commit -m 'second'
echo "third" > file echo "third" > file
jj branch create third jj bookmark create third
jj commit -m 'third' jj commit -m 'third'
) >/dev/null 2>&1 ) >/dev/null 2>&1

6
demos/demo_operation_log.sh
View File

@ -7,8 +7,8 @@ new_tmp_dir
jj git clone https://github.com/octocat/Hello-World jj git clone https://github.com/octocat/Hello-World
cd Hello-World cd Hello-World
jj abandon --ignore-immutable octocat-patch-1@origin jj abandon --ignore-immutable octocat-patch-1@origin
jj branch forget octocat-patch-1 jj bookmark forget octocat-patch-1
jj branch track test@origin jj bookmark track test@origin
} > /dev/null 2>&1 } > /dev/null 2>&1
comment "We are in the octocat/Hello-World repo. comment "We are in the octocat/Hello-World repo.
@ -18,7 +18,7 @@ run_command "jj op log"
comment "We are going to make some changes to show comment "We are going to make some changes to show
how the operation log works. Let's add a file, set how the operation log works. Let's add a file, set
a description, and rebase onto the \"test\" branch:" a description, and rebase onto the \"test\" bookmark:"
run_command "echo stuff > new-file" run_command "echo stuff > new-file"
run_command "jj describe -m stuff" run_command "jj describe -m stuff"
run_command "jj rebase -d test" run_command "jj rebase -d test"

6
demos/demo_resolve_conflicts.sh
View File

@ -7,11 +7,11 @@ new_tmp_dir
jj git clone https://github.com/octocat/Hello-World jj git clone https://github.com/octocat/Hello-World
cd Hello-World cd Hello-World
jj abandon --ignore-immutable test@origin jj abandon --ignore-immutable test@origin
jj branch forget test jj bookmark forget test
} > /dev/null 2>&1 } > /dev/null 2>&1
comment "We are on the master branch of the comment "We are on the master branch of the octocat/Hello-World repo,
octocat/Hello-World repo:" represented by the \"master\" bookmark on the parent commit."
run_command "jj log" run_command "jj log"
comment "Let's make an edit that will conflict comment "Let's make an edit that will conflict

8
demos/demo_working_copy.sh
View File

@ -7,9 +7,9 @@ new_tmp_dir
jj git clone https://github.com/octocat/Hello-World jj git clone https://github.com/octocat/Hello-World
cd Hello-World cd Hello-World
jj abandon --ignore-immutable test@origin jj abandon --ignore-immutable test@origin
jj branch forget test jj bookmark forget test
jj abandon --ignore-immutable octocat-patch-1@origin jj abandon --ignore-immutable octocat-patch-1@origin
jj branch forget octocat-patch-1 jj bookmark forget octocat-patch-1
}> /dev/null 2>&1 }> /dev/null 2>&1
comment "We are in the octocat/Hello-World repo. comment "We are in the octocat/Hello-World repo.
@ -25,9 +25,9 @@ comment "Because of these changes, our working copy is no longer marked as \"(em
Also, its commit ID (starting with a blue character) changed:" Also, its commit ID (starting with a blue character) changed:"
run_command "jj status" run_command "jj status"
comment "Add a branch so we can easily refer to this comment "Add a bookmark so we can easily refer to this
commit:" commit:"
run_command "jj branch create goodbye" run_command "jj bookmark create goodbye"
run_command "jj log" run_command "jj log"
comment "Start working on a new change off of master:" comment "Start working on a new change off of master:"

BIN
demos/git_compat.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 251 KiB

After

Width:  |  Height:  |  Size: 75 KiB

34
demos/git_compat.svg
View File

@ -40,39 +40,39 @@
</tspan><tspan xml:space="preserve" x="10" y="50" class="output"> </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="68" class="output">$ jj git clone https://github.com/octocat/Hello-World
</tspan><tspan xml:space="preserve" x="10" y="86" class="output">Fetching into new repo in "/private/var/folders/lj/rv4h95_d0mxb9ryztzpz4qph0000g<tspan class="hard-br" rotate="45" dx=".1em" dy="-.2em">↓</tspan> </tspan><tspan xml:space="preserve" x="10" y="86" class="output">Fetching into new repo in "/private/var/folders/lj/rv4h95_d0mxb9ryztzpz4qph0000g<tspan class="hard-br" rotate="45" dx=".1em" dy="-.2em">↓</tspan>
</tspan><tspan xml:space="preserve" x="10" y="104" class="output">n/T/tmp.ExrIt6VdYc/Hello-World" </tspan><tspan xml:space="preserve" x="10" y="104" class="output">n/T/tmp.v3wfSIm7te/Hello-World"
</tspan><tspan xml:space="preserve" x="10" y="122" class="output">branch: <tspan class="fg5">master@origin         </tspan> [new] untracked </tspan><tspan xml:space="preserve" x="10" y="122" class="output">bookmark: <tspan class="fg5">master@origin         </tspan> [new] untracked
</tspan><tspan xml:space="preserve" x="10" y="140" class="output">branch: <tspan class="fg5">octocat-patch-1@origin</tspan> [new] untracked </tspan><tspan xml:space="preserve" x="10" y="140" class="output">bookmark: <tspan class="fg5">octocat-patch-1@origin</tspan> [new] untracked
</tspan><tspan xml:space="preserve" x="10" y="158" class="output">branch: <tspan class="fg5">test@origin           </tspan> [new] untracked </tspan><tspan xml:space="preserve" x="10" y="158" class="output">bookmark: <tspan class="fg5">test@origin           </tspan> [new] untracked
</tspan><tspan xml:space="preserve" x="10" y="176" class="output">Setting the revset alias "trunk()" to "master@origin" </tspan><tspan xml:space="preserve" x="10" y="176" class="output">Setting the revset alias "trunk()" to "master@origin"
</tspan><tspan xml:space="preserve" x="10" y="194" class="output">Working copy now at: <tspan class="bold fg13">q</tspan><tspan class="bold fg8">yyypuyn</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">5</tspan><tspan class="bold fg8">57a65b9</tspan><tspan class="bold"> </tspan><tspan class="bold fg10">(empty)</tspan><tspan class="bold"> </tspan><tspan class="bold fg10">(no description set)</tspan> </tspan><tspan xml:space="preserve" x="10" y="194" class="output">Working copy now at: <tspan class="bold fg13">q</tspan><tspan class="bold fg8">otuunkp</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">d</tspan><tspan class="bold fg8">67be097</tspan><tspan class="bold"> </tspan><tspan class="bold fg10">(empty)</tspan><tspan class="bold"> </tspan><tspan class="bold fg10">(no description set)</tspan>
</tspan><tspan xml:space="preserve" x="10" y="212" class="output">Parent commit      : <tspan class="bold fg5">o</tspan><tspan class="fg8">rrkosyo</tspan> <tspan class="bold fg4">7</tspan><tspan class="fg8">fd1a60b</tspan> <tspan class="fg5">master</tspan><tspan class="fg8"> | </tspan><tspan class="fg2">(empty)</tspan> Merge pull request #6 fr<tspan class="hard-br" rotate="45" dx=".1em" dy="-.2em">↓</tspan> </tspan><tspan xml:space="preserve" x="10" y="212" class="output">Parent commit      : <tspan class="bold fg5">o</tspan><tspan class="fg8">rrkosyo</tspan> <tspan class="bold fg4">7</tspan><tspan class="fg8">fd1a60b</tspan> <tspan class="fg5">master</tspan><tspan class="fg8"> | </tspan><tspan class="fg2">(empty)</tspan> Merge pull request #6 fr<tspan class="hard-br" rotate="45" dx=".1em" dy="-.2em">↓</tspan>
</tspan><tspan xml:space="preserve" x="10" y="230" class="output">om Spaceghost/patch-1 </tspan><tspan xml:space="preserve" x="10" y="230" class="output">om Spaceghost/patch-1
</tspan><tspan xml:space="preserve" x="10" y="248" class="output">Added 1 files, modified 0 files, removed 0 files </tspan><tspan xml:space="preserve" x="10" y="248" class="output">Added 1 files, modified 0 files, removed 0 files
</tspan><tspan xml:space="preserve" x="10" y="266" class="output">$ cd Hello-World </tspan><tspan xml:space="preserve" x="10" y="266" class="output">$ cd Hello-World
</tspan><tspan xml:space="preserve" x="10" y="284" class="output"> </tspan><tspan xml:space="preserve" x="10" y="284" class="output">
</tspan><tspan xml:space="preserve" x="10" y="302" class="output"> </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"># By default, "jj" creates a local master branch tracking the remote master</tspan> </tspan><tspan xml:space="preserve" x="10" y="320" class="output"><tspan class="fg2"># By default, "jj" creates a local bookmark "master" tracking the remote master</tspan>
</tspan><tspan xml:space="preserve" x="10" y="338" class="output"><tspan class="fg2"># branch. The other branches are only available as remote-tracking branches.</tspan> </tspan><tspan xml:space="preserve" x="10" y="338" class="output"><tspan class="fg2"># branch. Other remote branches are only available as remote-tracking bookmarks.</tspan>
</tspan><tspan xml:space="preserve" x="10" y="356" class="output"> </tspan><tspan xml:space="preserve" x="10" y="356" class="output">
</tspan><tspan xml:space="preserve" x="10" y="374" class="output">$ jj branch list --all </tspan><tspan xml:space="preserve" x="10" y="374" class="output">$ jj bookmark list --all
</tspan><tspan xml:space="preserve" x="10" y="392" class="output"><tspan class="fg5">master</tspan>: <tspan class="bold fg5">o</tspan><tspan class="fg8">rrkosyo</tspan> <tspan class="bold fg4">7</tspan><tspan class="fg8">fd1a60b</tspan> <tspan class="fg2">(empty)</tspan> Merge pull request #6 from Spaceghost/patch-1 </tspan><tspan xml:space="preserve" x="10" y="392" class="output"><tspan class="fg5">master</tspan>: <tspan class="bold fg5">o</tspan><tspan class="fg8">rrkosyo</tspan> <tspan class="bold fg4">7</tspan><tspan class="fg8">fd1a60b</tspan> <tspan class="fg2">(empty)</tspan> Merge pull request #6 from Spaceghost/patch-1
</tspan><tspan xml:space="preserve" x="10" y="410" class="output">  <tspan class="fg5">@origin</tspan>: <tspan class="bold fg5">o</tspan><tspan class="fg8">rrkosyo</tspan> <tspan class="bold fg4">7</tspan><tspan class="fg8">fd1a60b</tspan> <tspan class="fg2">(empty)</tspan> Merge pull request #6 from Spaceghost/patch<tspan class="hard-br" rotate="45" dx=".1em" dy="-.2em">↓</tspan> </tspan><tspan xml:space="preserve" x="10" y="410" class="output">  <tspan class="fg5">@origin</tspan>: <tspan class="bold fg5">o</tspan><tspan class="fg8">rrkosyo</tspan> <tspan class="bold fg4">7</tspan><tspan class="fg8">fd1a60b</tspan> <tspan class="fg2">(empty)</tspan> Merge pull request #6 from Spaceghost/patch<tspan class="hard-br" rotate="45" dx=".1em" dy="-.2em">↓</tspan>
</tspan><tspan xml:space="preserve" x="10" y="428" class="output">-1 </tspan><tspan xml:space="preserve" x="10" y="428" class="output">-1
</tspan><tspan xml:space="preserve" x="10" y="446" class="output"><tspan class="fg5">octocat-patch-1@origin</tspan>: <tspan class="bold fg5">t</tspan><tspan class="fg8">pstlust</tspan> <tspan class="bold fg4">b1</tspan><tspan class="fg8">b3f972</tspan> sentence case </tspan><tspan xml:space="preserve" x="10" y="446" class="output"><tspan class="fg5">octocat-patch-1@origin</tspan>: <tspan class="bold fg5">t</tspan><tspan class="fg8">pstlust</tspan> <tspan class="bold fg4">b1</tspan><tspan class="fg8">b3f972</tspan> sentence case
</tspan><tspan xml:space="preserve" x="10" y="464" class="output"><tspan class="fg5">test@origin</tspan>: <tspan class="bold fg5">k</tspan><tspan class="fg8">owxouwz</tspan> <tspan class="bold fg4">b3</tspan><tspan class="fg8">cbd5bb</tspan> Create CONTRIBUTING.md </tspan><tspan xml:space="preserve" x="10" y="464" class="output"><tspan class="fg5">test@origin</tspan>: <tspan class="bold fg5">k</tspan><tspan class="fg8">owxouwz</tspan> <tspan class="bold fg4">b3</tspan><tspan class="fg8">cbd5bb</tspan> Create CONTRIBUTING.md
</tspan><tspan xml:space="preserve" x="10" y="482" class="output"> </tspan><tspan xml:space="preserve" x="10" y="482" class="output">
</tspan><tspan xml:space="preserve" x="10" y="500" class="output"><tspan class="fg2"># We can create a local branch tracking one of the remote branches we just</tspan> </tspan><tspan xml:space="preserve" x="10" y="500" class="output"><tspan class="fg2"># We can create a local bookmark tracking one of the remote branches we just</tspan>
</tspan><tspan xml:space="preserve" x="10" y="518" class="output"><tspan class="fg2"># fetched.</tspan> </tspan><tspan xml:space="preserve" x="10" y="518" class="output"><tspan class="fg2"># fetched.</tspan>
</tspan><tspan xml:space="preserve" x="10" y="536" class="output"> </tspan><tspan xml:space="preserve" x="10" y="536" class="output">
</tspan><tspan xml:space="preserve" x="10" y="554" class="output">$ jj branch track octocat-patch-1@origin </tspan><tspan xml:space="preserve" x="10" y="554" class="output">$ jj bookmark track octocat-patch-1@origin
</tspan><tspan xml:space="preserve" x="10" y="572" class="output">Started tracking 1 remote branches. </tspan><tspan xml:space="preserve" x="10" y="572" class="output">Started tracking 1 remote bookmarks.
</tspan><tspan xml:space="preserve" x="10" y="590" class="output"> </tspan><tspan xml:space="preserve" x="10" y="590" class="output">
</tspan><tspan xml:space="preserve" x="10" y="608" class="output"><tspan class="fg2"># By default, "jj log" excludes untracked remote branches to focus on</tspan> </tspan><tspan xml:space="preserve" x="10" y="608" class="output"><tspan class="fg2"># By default, "jj log" excludes untracked remote branches to focus on</tspan>
</tspan><tspan xml:space="preserve" x="10" y="626" class="output"><tspan class="fg2"># "our" commits.</tspan> </tspan><tspan xml:space="preserve" x="10" y="626" class="output"><tspan class="fg2"># "our" commits.</tspan>
</tspan><tspan xml:space="preserve" x="10" y="644" class="output"> </tspan><tspan xml:space="preserve" x="10" y="644" class="output">
</tspan><tspan xml:space="preserve" x="10" y="662" class="output">$ jj log </tspan><tspan xml:space="preserve" x="10" y="662" class="output">$ jj log
</tspan><tspan xml:space="preserve" x="10" y="680" class="output"><tspan class="bold fg2">@</tspan>  <tspan class="bold fg13">q</tspan><tspan class="bold fg8">yyypuyn</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@example.com</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">2024-09-04 19:29:24</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">5</tspan><tspan class="bold fg8">57a65b9</tspan> </tspan><tspan xml:space="preserve" x="10" y="680" class="output"><tspan class="bold fg2">@</tspan>  <tspan class="bold fg13">q</tspan><tspan class="bold fg8">otuunkp</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@example.com</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">2024-10-13 19:54:52</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">d</tspan><tspan class="bold fg8">67be097</tspan>
</tspan><tspan xml:space="preserve" x="10" y="698" class="output">│  <tspan class="bold fg10">(empty)</tspan><tspan class="bold"> </tspan><tspan class="bold fg10">(no description set)</tspan> </tspan><tspan xml:space="preserve" x="10" y="698" class="output">│  <tspan class="bold fg10">(empty)</tspan><tspan class="bold"> </tspan><tspan class="bold fg10">(no description set)</tspan>
</tspan><tspan xml:space="preserve" x="10" y="716" class="output">│ ○  <tspan class="bold fg5">t</tspan><tspan class="fg8">pstlust</tspan> <tspan class="fg3">support+octocat@github.com</tspan> <tspan class="fg6">2018-05-10 10:55:19</tspan> <tspan class="fg5">octocat-patch-1</tspan> </tspan><tspan xml:space="preserve" x="10" y="716" class="output">│ ○  <tspan class="bold fg5">t</tspan><tspan class="fg8">pstlust</tspan> <tspan class="fg3">support+octocat@github.com</tspan> <tspan class="fg6">2018-05-10 10:55:19</tspan> <tspan class="fg5">octocat-patch-1</tspan>
</tspan><tspan xml:space="preserve" x="10" y="734" class="output">├─╯  <tspan class="bold fg4">b</tspan><tspan class="fg8">1b3f972</tspan> </tspan><tspan xml:space="preserve" x="10" y="734" class="output">├─╯  <tspan class="bold fg4">b</tspan><tspan class="fg8">1b3f972</tspan>
@ -84,7 +84,7 @@
</tspan><tspan xml:space="preserve" x="10" y="842" class="output"><tspan class="fg2"># We can also ask "jj" to show all the commits.</tspan> </tspan><tspan xml:space="preserve" x="10" y="842" class="output"><tspan class="fg2"># We can also ask "jj" to show all the commits.</tspan>
</tspan><tspan xml:space="preserve" x="10" y="860" class="output"> </tspan><tspan xml:space="preserve" x="10" y="860" class="output">
</tspan><tspan xml:space="preserve" x="10" y="878" class="output">$ jj log -r 'all()' </tspan><tspan xml:space="preserve" x="10" y="878" class="output">$ jj log -r 'all()'
</tspan><tspan xml:space="preserve" x="10" y="896" class="output"><tspan class="bold fg2">@</tspan>  <tspan class="bold fg13">q</tspan><tspan class="bold fg8">yyypuyn</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@example.com</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">2024-09-04 19:29:24</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">5</tspan><tspan class="bold fg8">57a65b9</tspan> </tspan><tspan xml:space="preserve" x="10" y="896" class="output"><tspan class="bold fg2">@</tspan>  <tspan class="bold fg13">q</tspan><tspan class="bold fg8">otuunkp</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@example.com</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">2024-10-13 19:54:52</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">d</tspan><tspan class="bold fg8">67be097</tspan>
</tspan><tspan xml:space="preserve" x="10" y="914" class="output">│  <tspan class="bold fg10">(empty)</tspan><tspan class="bold"> </tspan><tspan class="bold fg10">(no description set)</tspan> </tspan><tspan xml:space="preserve" x="10" y="914" class="output">│  <tspan class="bold fg10">(empty)</tspan><tspan class="bold"> </tspan><tspan class="bold fg10">(no description set)</tspan>
</tspan><tspan xml:space="preserve" x="10" y="932" class="output">│ ○  <tspan class="bold fg5">t</tspan><tspan class="fg8">pstlust</tspan> <tspan class="fg3">support+octocat@github.com</tspan> <tspan class="fg6">2018-05-10 10:55:19</tspan> <tspan class="fg5">octocat-patch-1</tspan> </tspan><tspan xml:space="preserve" x="10" y="932" class="output">│ ○  <tspan class="bold fg5">t</tspan><tspan class="fg8">pstlust</tspan> <tspan class="fg3">support+octocat@github.com</tspan> <tspan class="fg6">2018-05-10 10:55:19</tspan> <tspan class="fg5">octocat-patch-1</tspan>
</tspan><tspan xml:space="preserve" x="10" y="950" class="output">├─╯  <tspan class="bold fg4">b</tspan><tspan class="fg8">1b3f972</tspan> </tspan><tspan xml:space="preserve" x="10" y="950" class="output">├─╯  <tspan class="bold fg4">b</tspan><tspan class="fg8">1b3f972</tspan>
@ -95,9 +95,9 @@
</tspan><tspan xml:space="preserve" x="10" y="1040" class="output">├─╮  <tspan class="fg2">(empty)</tspan> Merge pull request #6 from Spaceghost/patch-1 </tspan><tspan xml:space="preserve" x="10" y="1040" class="output">├─╮  <tspan class="fg2">(empty)</tspan> Merge pull request #6 from Spaceghost/patch-1
</tspan><tspan xml:space="preserve" x="10" y="1058" class="output">│ <tspan class="bold fg14">◆</tspan>  <tspan class="bold fg5">n</tspan><tspan class="fg8">znozkvv</tspan> <tspan class="fg3">Johnneylee.rollins@gmail.com</tspan> <tspan class="fg6">2011-09-13 21:42:41</tspan> <tspan class="bold fg4">76</tspan><tspan class="fg8">294131</tspan> </tspan><tspan xml:space="preserve" x="10" y="1058" class="output">│ <tspan class="bold fg14">◆</tspan>  <tspan class="bold fg5">n</tspan><tspan class="fg8">znozkvv</tspan> <tspan class="fg3">Johnneylee.rollins@gmail.com</tspan> <tspan class="fg6">2011-09-13 21:42:41</tspan> <tspan class="bold fg4">76</tspan><tspan class="fg8">294131</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1076" class="output">├─╯  New line at end of file. --Signed off by Spaceghost </tspan><tspan xml:space="preserve" x="10" y="1076" class="output">├─╯  New line at end of file. --Signed off by Spaceghost
</tspan><tspan xml:space="preserve" x="10" y="1094" class="output"><tspan class="bold fg14">◆</tspan>  <tspan class="bold fg5">s</tspan><tspan class="fg8">yktoqts</tspan> <tspan class="fg3">cameron@github.com</tspan> <tspan class="fg6">2011-01-26 12:06:08</tspan> <tspan class="bold fg4">553</tspan><tspan class="fg8">c2077</tspan> </tspan><tspan xml:space="preserve" x="10" y="1094" class="output"><tspan class="bold fg14">◆</tspan>  <tspan class="bold fg5">s</tspan><tspan class="fg8">yktoqts</tspan> <tspan class="fg3">cameron@github.com</tspan> <tspan class="fg6">2011-01-26 12:06:08</tspan> <tspan class="bold fg4">5</tspan><tspan class="fg8">53c2077</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1112" class="output">│  first commit </tspan><tspan xml:space="preserve" x="10" y="1112" class="output">│  first commit
</tspan><tspan xml:space="preserve" x="10" y="1130" class="output"><tspan class="bold fg14">◆</tspan>  <tspan class="bold fg5">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="1130" class="output"><tspan class="bold fg14">◆</tspan>  <tspan class="bold fg5">zz</tspan><tspan class="fg8">zzzzzz</tspan> <tspan class="fg2">root()</tspan> <tspan class="bold fg4">0</tspan><tspan class="fg8">0000000</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1148" class="output"> </tspan><tspan xml:space="preserve" x="10" y="1148" class="output">
</tspan><tspan xml:space="preserve" x="10" y="1166" class="output"><tspan class="fg2"># We can look at the diffs of commits in the repo</tspan> </tspan><tspan xml:space="preserve" x="10" y="1166" class="output"><tspan class="fg2"># We can look at the diffs of commits in the repo</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1184" class="output"> </tspan><tspan xml:space="preserve" x="10" y="1184" class="output">
@ -112,8 +112,8 @@
</tspan><tspan xml:space="preserve" x="10" y="1346" class="output"><tspan class="fg2"># The repo is backed by the actual Git repo:</tspan> </tspan><tspan xml:space="preserve" x="10" y="1346" class="output"><tspan class="fg2"># The repo is backed by the actual Git repo:</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1364" class="output"> </tspan><tspan xml:space="preserve" x="10" y="1364" class="output">
</tspan><tspan xml:space="preserve" x="10" y="1382" class="output">$ git --git-dir=.jj/repo/store/git log --graph --all --decorate --oneline </tspan><tspan xml:space="preserve" x="10" y="1382" class="output">$ git --git-dir=.jj/repo/store/git log --graph --all --decorate --oneline
</tspan><tspan xml:space="preserve" x="10" y="1400" class="output">* <tspan class="fg3">557a65b</tspan>  </tspan><tspan xml:space="preserve" x="10" y="1400" class="output">* <tspan class="fg3">8aaad6b</tspan> 
</tspan><tspan xml:space="preserve" x="10" y="1418" class="output"><tspan class="fg1">|</tspan> * <tspan class="fg3">1ccbcd7</tspan>  </tspan><tspan xml:space="preserve" x="10" y="1418" class="output">* <tspan class="fg3">d67be09</tspan> 
</tspan><tspan xml:space="preserve" x="10" y="1436" class="output"><tspan class="fg1">|</tspan> * <tspan class="fg3">b1b3f97</tspan><tspan class="fg3"> (</tspan><tspan class="bold fg1">origin/octocat-patch-1</tspan><tspan class="fg3">)</tspan> sentence case </tspan><tspan xml:space="preserve" x="10" y="1436" class="output"><tspan class="fg1">|</tspan> * <tspan class="fg3">b1b3f97</tspan><tspan class="fg3"> (</tspan><tspan class="bold fg1">origin/octocat-patch-1</tspan><tspan class="fg3">)</tspan> sentence case
</tspan><tspan xml:space="preserve" x="10" y="1454" class="output"><tspan class="fg1">|</tspan><tspan class="fg1">/</tspan>   </tspan><tspan xml:space="preserve" x="10" y="1454" class="output"><tspan class="fg1">|</tspan><tspan class="fg1">/</tspan>  
</tspan><tspan xml:space="preserve" x="10" y="1472" class="output"><tspan class="fg1">|</tspan> * <tspan class="fg3">b3cbd5b</tspan><tspan class="fg3"> (</tspan><tspan class="bold fg1">origin/test</tspan><tspan class="fg3">)</tspan> Create CONTRIBUTING.md </tspan><tspan xml:space="preserve" x="10" y="1472" class="output"><tspan class="fg1">|</tspan> * <tspan class="fg3">b3cbd5b</tspan><tspan class="fg3"> (</tspan><tspan class="bold fg1">origin/test</tspan><tspan class="fg3">)</tspan> Create CONTRIBUTING.md

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 16 KiB

BIN
demos/juggle_conflicts.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 237 KiB

After

Width:  |  Height:  |  Size: 61 KiB

44
demos/juggle_conflicts.svg
View File

@ -40,15 +40,15 @@
</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="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="68" class="output">
</tspan><tspan xml:space="preserve" x="10" y="86" class="output">$ jj log </tspan><tspan xml:space="preserve" x="10" y="86" class="output">$ jj log
</tspan><tspan xml:space="preserve" x="10" y="104" class="output"><tspan class="bold fg2">@</tspan>  <tspan class="bold fg13">mnr</tspan><tspan class="bold fg8">ltoyz</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@example.com</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">2024-09-04 19:32:07</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">0a</tspan><tspan class="bold fg8">13891c</tspan> </tspan><tspan xml:space="preserve" x="10" y="104" class="output"><tspan class="bold fg2">@</tspan>  <tspan class="bold fg13">x</tspan><tspan class="bold fg8">tlupomq</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@example.com</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">2024-10-13 19:54:53</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">f</tspan><tspan class="bold fg8">d822031</tspan>
</tspan><tspan xml:space="preserve" x="10" y="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="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">mnk</tspan><tspan class="fg8">svwsq</tspan> <tspan class="fg3">jjfan@example.com</tspan> <tspan class="fg6">2024-09-04 19:32:07</tspan> <tspan class="fg5">third</tspan> <tspan class="bold fg4">c</tspan><tspan class="fg8">69ca402</tspan> </tspan><tspan xml:space="preserve" x="10" y="140" class="output">○  <tspan class="bold fg5">vl</tspan><tspan class="fg8">rryzpm</tspan> <tspan class="fg3">jjfan@example.com</tspan> <tspan class="fg6">2024-10-13 19:54:53</tspan> <tspan class="fg5">third</tspan> <tspan class="bold fg4">e</tspan><tspan class="fg8">5609328</tspan>
</tspan><tspan xml:space="preserve" x="10" y="158" class="output">│  third </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">xssrovn</tspan> <tspan class="fg3">jjfan@example.com</tspan> <tspan class="fg6">2024-09-04 19:32:07</tspan> <tspan class="fg5">second</tspan> <tspan class="bold fg4">d</tspan><tspan class="fg8">4f1281c</tspan> </tspan><tspan xml:space="preserve" x="10" y="176" class="output">○  <tspan class="bold fg5">vo</tspan><tspan class="fg8">zropow</tspan> <tspan class="fg3">jjfan@example.com</tspan> <tspan class="fg6">2024-10-13 19:54:53</tspan> <tspan class="fg5">second</tspan> <tspan class="bold fg4">8</tspan><tspan class="fg8">38a97d1</tspan>
</tspan><tspan xml:space="preserve" x="10" y="194" class="output">│  second </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">zw</tspan><tspan class="fg8">lynwuo</tspan> <tspan class="fg3">jjfan@example.com</tspan> <tspan class="fg6">2024-09-04 19:32:07</tspan> <tspan class="fg5">first</tspan> <tspan class="bold fg4">2</tspan><tspan class="fg8">3b66a7d</tspan> </tspan><tspan xml:space="preserve" x="10" y="212" class="output">○  <tspan class="bold fg5">y</tspan><tspan class="fg8">zkyuwyx</tspan> <tspan class="fg3">jjfan@example.com</tspan> <tspan class="fg6">2024-10-13 19:54:53</tspan> <tspan class="fg5">first</tspan> <tspan class="bold fg4">d</tspan><tspan class="fg8">11b168f</tspan>
</tspan><tspan xml:space="preserve" x="10" y="230" class="output">│  first </tspan><tspan xml:space="preserve" x="10" y="230" class="output">│  first
</tspan><tspan xml:space="preserve" x="10" y="248" class="output"><tspan class="bold fg14">◆</tspan>  <tspan class="bold fg5">zz</tspan><tspan class="fg8">zzzzzz</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="248" class="output"><tspan class="bold fg14">◆</tspan>  <tspan class="bold fg5">z</tspan><tspan class="fg8">zzzzzzz</tspan> <tspan class="fg2">root()</tspan> <tspan class="bold fg4">0</tspan><tspan class="fg8">0000000</tspan>
</tspan><tspan xml:space="preserve" x="10" y="266" class="output">$ jj diff -r first </tspan><tspan xml:space="preserve" x="10" y="266" class="output">$ jj diff -r first
</tspan><tspan xml:space="preserve" x="10" y="284" class="output"><tspan class="fg3">Added regular file file:</tspan> </tspan><tspan xml:space="preserve" x="10" y="284" class="output"><tspan class="fg3">Added regular file file:</tspan>
</tspan><tspan xml:space="preserve" x="10" y="302" class="output">     <tspan class="fg2">   1</tspan>: <tspan class="underline fg2">first</tspan> </tspan><tspan xml:space="preserve" x="10" y="302" class="output">     <tspan class="fg2">   1</tspan>: <tspan class="underline fg2">first</tspan>
@ -66,15 +66,15 @@
</tspan><tspan xml:space="preserve" x="10" y="518" class="output">$ jj rebase -s second -d third </tspan><tspan xml:space="preserve" x="10" y="518" class="output">$ jj rebase -s second -d third
</tspan><tspan xml:space="preserve" x="10" y="536" class="output">Rebased 1 commits </tspan><tspan xml:space="preserve" x="10" y="536" class="output">Rebased 1 commits
</tspan><tspan xml:space="preserve" x="10" y="554" class="output">$ jj log </tspan><tspan xml:space="preserve" x="10" y="554" class="output">$ jj log
</tspan><tspan xml:space="preserve" x="10" y="572" class="output">○  <tspan class="bold fg5">p</tspan><tspan class="fg8">xssrovn</tspan> <tspan class="fg3">jjfan@example.com</tspan> <tspan class="fg6">2024-09-04 19:32:07</tspan> <tspan class="fg5">second</tspan> <tspan class="bold fg4">f3</tspan><tspan class="fg8">d448cf</tspan> </tspan><tspan xml:space="preserve" x="10" y="572" class="output">○  <tspan class="bold fg5">vo</tspan><tspan class="fg8">zropow</tspan> <tspan class="fg3">jjfan@example.com</tspan> <tspan class="fg6">2024-10-13 19:54:54</tspan> <tspan class="fg5">second</tspan> <tspan class="bold fg4">b</tspan><tspan class="fg8">ab527f4</tspan>
</tspan><tspan xml:space="preserve" x="10" y="590" class="output">│  second </tspan><tspan xml:space="preserve" x="10" y="590" class="output">│  second
</tspan><tspan xml:space="preserve" x="10" y="608" class="output">│ <tspan class="bold fg9">@</tspan>  <tspan class="bold fg13">mnr</tspan><tspan class="bold fg8">ltoyz</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@example.com</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">2024-09-04 19:32:07</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">ff</tspan><tspan class="bold fg8">8340a7</tspan><tspan class="bold"> </tspan><tspan class="bold fg9">conflict</tspan> </tspan><tspan xml:space="preserve" x="10" y="608" class="output">│ <tspan class="bold fg9">@</tspan>  <tspan class="bold fg13">x</tspan><tspan class="bold fg8">tlupomq</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@example.com</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">2024-10-13 19:54:54</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">c</tspan><tspan class="bold fg8">ccec5aa</tspan><tspan class="bold"> </tspan><tspan class="bold fg9">conflict</tspan>
</tspan><tspan xml:space="preserve" x="10" y="626" class="output">├─╯  <tspan class="bold fg10">(empty)</tspan><tspan class="bold"> </tspan><tspan class="bold fg10">(no description set)</tspan> </tspan><tspan xml:space="preserve" x="10" y="626" class="output">├─╯  <tspan class="bold fg10">(empty)</tspan><tspan class="bold"> </tspan><tspan class="bold fg10">(no description set)</tspan>
</tspan><tspan xml:space="preserve" x="10" y="644" class="output"><tspan class="bold fg1">×</tspan>  <tspan class="bold fg5">mnk</tspan><tspan class="fg8">svwsq</tspan> <tspan class="fg3">jjfan@example.com</tspan> <tspan class="fg6">2024-09-04 19:32:07</tspan> <tspan class="fg5">third</tspan> <tspan class="bold fg4">1</tspan><tspan class="fg8">395ab1c</tspan> <tspan class="fg1">conflict</tspan> </tspan><tspan xml:space="preserve" x="10" y="644" class="output"><tspan class="bold fg1">×</tspan>  <tspan class="bold fg5">vl</tspan><tspan class="fg8">rryzpm</tspan> <tspan class="fg3">jjfan@example.com</tspan> <tspan class="fg6">2024-10-13 19:54:54</tspan> <tspan class="fg5">third</tspan> <tspan class="bold fg4">2</tspan><tspan class="fg8">52149ab</tspan> <tspan class="fg1">conflict</tspan>
</tspan><tspan xml:space="preserve" x="10" y="662" class="output">│  third </tspan><tspan xml:space="preserve" x="10" y="662" class="output">│  third
</tspan><tspan xml:space="preserve" x="10" y="680" class="output">○  <tspan class="bold fg5">zw</tspan><tspan class="fg8">lynwuo</tspan> <tspan class="fg3">jjfan@example.com</tspan> <tspan class="fg6">2024-09-04 19:32:07</tspan> <tspan class="fg5">first</tspan> <tspan class="bold fg4">2</tspan><tspan class="fg8">3b66a7d</tspan> </tspan><tspan xml:space="preserve" x="10" y="680" class="output">○  <tspan class="bold fg5">y</tspan><tspan class="fg8">zkyuwyx</tspan> <tspan class="fg3">jjfan@example.com</tspan> <tspan class="fg6">2024-10-13 19:54:53</tspan> <tspan class="fg5">first</tspan> <tspan class="bold fg4">d</tspan><tspan class="fg8">11b168f</tspan>
</tspan><tspan xml:space="preserve" x="10" y="698" class="output">│  first </tspan><tspan xml:space="preserve" x="10" y="698" class="output">│  first
</tspan><tspan xml:space="preserve" x="10" y="716" class="output"><tspan class="bold fg14">◆</tspan>  <tspan class="bold fg5">zz</tspan><tspan class="fg8">zzzzzz</tspan> <tspan class="fg2">root()</tspan> <tspan class="bold fg4">0</tspan><tspan class="fg8">0000000</tspan> </tspan><tspan xml:space="preserve" x="10" y="716" class="output"><tspan class="bold fg14">◆</tspan>  <tspan class="bold fg5">z</tspan><tspan class="fg8">zzzzzzz</tspan> <tspan class="fg2">root()</tspan> <tspan class="bold fg4">0</tspan><tspan class="fg8">0000000</tspan>
</tspan><tspan xml:space="preserve" x="10" y="734" class="output"> </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"># The commit labeled "third" has a conflict, as expected. What's more</tspan> </tspan><tspan xml:space="preserve" x="10" y="752" class="output"><tspan class="fg2"># The commit labeled "third" has a conflict, as expected. What's more</tspan>
</tspan><tspan xml:space="preserve" x="10" y="770" class="output"><tspan class="fg2"># interesting is that the top commit has no conflict! That's because it</tspan> </tspan><tspan xml:space="preserve" x="10" y="770" class="output"><tspan class="fg2"># interesting is that the top commit has no conflict! That's because it</tspan>
@ -83,8 +83,8 @@
</tspan><tspan xml:space="preserve" x="10" y="824" class="output"><tspan class="fg2"># Let's verify that by looking at its contents:</tspan> </tspan><tspan xml:space="preserve" x="10" y="824" class="output"><tspan class="fg2"># Let's verify that by looking at its contents:</tspan>
</tspan><tspan xml:space="preserve" x="10" y="842" class="output"> </tspan><tspan xml:space="preserve" x="10" y="842" class="output">
</tspan><tspan xml:space="preserve" x="10" y="860" class="output">$ jj new second </tspan><tspan xml:space="preserve" x="10" y="860" class="output">$ jj new second
</tspan><tspan xml:space="preserve" x="10" y="878" class="output">Working copy now at: <tspan class="bold fg13">t</tspan><tspan class="bold fg8">llxozup</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">a</tspan><tspan class="bold fg8">cb9a438</tspan><tspan class="bold"> </tspan><tspan class="bold fg10">(empty)</tspan><tspan class="bold"> </tspan><tspan class="bold fg10">(no description set)</tspan> </tspan><tspan xml:space="preserve" x="10" y="878" class="output">Working copy now at: <tspan class="bold fg13">l</tspan><tspan class="bold fg8">wwotoor</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">7</tspan><tspan class="bold fg8">d2b3194</tspan><tspan class="bold"> </tspan><tspan class="bold fg10">(empty)</tspan><tspan class="bold"> </tspan><tspan class="bold fg10">(no description set)</tspan>
</tspan><tspan xml:space="preserve" x="10" y="896" class="output">Parent commit      : <tspan class="bold fg5">p</tspan><tspan class="fg8">xssrovn</tspan> <tspan class="bold fg4">f</tspan><tspan class="fg8">3d448cf</tspan> <tspan class="fg5">second</tspan><tspan class="fg8"> | </tspan>second </tspan><tspan xml:space="preserve" x="10" y="896" class="output">Parent commit      : <tspan class="bold fg5">vo</tspan><tspan class="fg8">zropow</tspan> <tspan class="bold fg4">b</tspan><tspan class="fg8">ab527f4</tspan> <tspan class="fg5">second</tspan><tspan class="fg8"> | </tspan>second
</tspan><tspan xml:space="preserve" x="10" y="914" class="output">Added 0 files, modified 1 files, removed 0 files </tspan><tspan xml:space="preserve" x="10" y="914" class="output">Added 0 files, modified 1 files, removed 0 files
</tspan><tspan xml:space="preserve" x="10" y="932" class="output">$ cat file </tspan><tspan xml:space="preserve" x="10" y="932" class="output">$ cat file
</tspan><tspan xml:space="preserve" x="10" y="950" class="output">third </tspan><tspan xml:space="preserve" x="10" y="950" class="output">third
@ -94,24 +94,24 @@
</tspan><tspan xml:space="preserve" x="10" y="1022" class="output"> </tspan><tspan xml:space="preserve" x="10" y="1022" class="output">
</tspan><tspan xml:space="preserve" x="10" y="1040" class="output">$ jj rebase -s second -d first </tspan><tspan xml:space="preserve" x="10" y="1040" class="output">$ jj rebase -s second -d first
</tspan><tspan xml:space="preserve" x="10" y="1058" class="output">Rebased 2 commits </tspan><tspan xml:space="preserve" x="10" y="1058" class="output">Rebased 2 commits
</tspan><tspan xml:space="preserve" x="10" y="1076" class="output">Working copy now at: <tspan class="bold fg13">t</tspan><tspan class="bold fg8">llxozup</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">d</tspan><tspan class="bold fg8">999f947</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="1076" class="output">Working copy now at: <tspan class="bold fg13">l</tspan><tspan class="bold fg8">wwotoor</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">f</tspan><tspan class="bold fg8">6445745</tspan><tspan class="bold"> </tspan><tspan class="bold fg10">(empty)</tspan><tspan class="bold"> </tspan><tspan class="bold fg10">(no description set)</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1094" class="output">Parent commit      : <tspan class="bold fg5">p</tspan><tspan class="fg8">xssrovn</tspan> <tspan class="bold fg4">a</tspan><tspan class="fg8">8719aaa</tspan> <tspan class="fg5">second</tspan><tspan class="fg8"> | </tspan>second </tspan><tspan xml:space="preserve" x="10" y="1094" class="output">Parent commit      : <tspan class="bold fg5">vo</tspan><tspan class="fg8">zropow</tspan> <tspan class="bold fg4">5</tspan><tspan class="fg8">ccf5c89</tspan> <tspan class="fg5">second</tspan><tspan class="fg8"> | </tspan>second
</tspan><tspan xml:space="preserve" x="10" y="1112" class="output">Added 0 files, modified 1 files, removed 0 files </tspan><tspan xml:space="preserve" x="10" y="1112" class="output">Added 0 files, modified 1 files, removed 0 files
</tspan><tspan xml:space="preserve" x="10" y="1130" class="output">$ jj new second third -m merged </tspan><tspan xml:space="preserve" x="10" y="1130" class="output">$ jj new second third -m merged
</tspan><tspan xml:space="preserve" x="10" y="1148" class="output">Working copy now at: <tspan class="bold fg13">x</tspan><tspan class="bold fg8">kynxupu</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">e</tspan><tspan class="bold fg8">5bb9694</tspan><tspan class="bold"> </tspan><tspan class="bold fg10">(empty)</tspan><tspan class="bold"> merged</tspan> </tspan><tspan xml:space="preserve" x="10" y="1148" class="output">Working copy now at: <tspan class="bold fg13">k</tspan><tspan class="bold fg8">tkzxtmq</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">2d</tspan><tspan class="bold fg8">d72c52</tspan><tspan class="bold"> </tspan><tspan class="bold fg10">(empty)</tspan><tspan class="bold"> merged</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1166" class="output">Parent commit      : <tspan class="bold fg5">p</tspan><tspan class="fg8">xssrovn</tspan> <tspan class="bold fg4">a</tspan><tspan class="fg8">8719aaa</tspan> <tspan class="fg5">second</tspan><tspan class="fg8"> | </tspan>second </tspan><tspan xml:space="preserve" x="10" y="1166" class="output">Parent commit      : <tspan class="bold fg5">vo</tspan><tspan class="fg8">zropow</tspan> <tspan class="bold fg4">5</tspan><tspan class="fg8">ccf5c89</tspan> <tspan class="fg5">second</tspan><tspan class="fg8"> | </tspan>second
</tspan><tspan xml:space="preserve" x="10" y="1184" class="output">Parent commit      : <tspan class="bold fg5">m</tspan><tspan class="fg8">nksvwsq</tspan> <tspan class="bold fg4">1</tspan><tspan class="fg8">395ab1c</tspan> <tspan class="fg5">third</tspan><tspan class="fg8"> | </tspan><tspan class="fg1">(conflict)</tspan> third </tspan><tspan xml:space="preserve" x="10" y="1184" class="output">Parent commit      : <tspan class="bold fg5">vl</tspan><tspan class="fg8">rryzpm</tspan> <tspan class="bold fg4">25</tspan><tspan class="fg8">2149ab</tspan> <tspan class="fg5">third</tspan><tspan class="fg8"> | </tspan><tspan class="fg1">(conflict)</tspan> third
</tspan><tspan xml:space="preserve" x="10" y="1202" class="output">Added 0 files, modified 1 files, removed 0 files </tspan><tspan xml:space="preserve" x="10" y="1202" class="output">Added 0 files, modified 1 files, removed 0 files
</tspan><tspan xml:space="preserve" x="10" y="1220" class="output">$ jj log </tspan><tspan xml:space="preserve" x="10" y="1220" class="output">$ jj log
</tspan><tspan xml:space="preserve" x="10" y="1238" class="output"><tspan class="bold fg2">@</tspan>    <tspan class="bold fg13">x</tspan><tspan class="bold fg8">kynxupu</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@example.com</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">2024-09-04 19:32:07</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">e</tspan><tspan class="bold fg8">5bb9694</tspan> </tspan><tspan xml:space="preserve" x="10" y="1238" class="output"><tspan class="bold fg2">@</tspan>    <tspan class="bold fg13">k</tspan><tspan class="bold fg8">tkzxtmq</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@example.com</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">2024-10-13 19:54:54</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">2d</tspan><tspan class="bold fg8">d72c52</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1256" class="output">├─╮  <tspan class="bold fg10">(empty)</tspan><tspan class="bold"> merged</tspan> </tspan><tspan xml:space="preserve" x="10" y="1256" class="output">├─╮  <tspan class="bold fg10">(empty)</tspan><tspan class="bold"> merged</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1274" class="output">│ <tspan class="bold fg1">×</tspan>  <tspan class="bold fg5">m</tspan><tspan class="fg8">nksvwsq</tspan> <tspan class="fg3">jjfan@example.com</tspan> <tspan class="fg6">2024-09-04 19:32:07</tspan> <tspan class="fg5">third</tspan> <tspan class="bold fg4">1</tspan><tspan class="fg8">395ab1c</tspan> <tspan class="fg1">conflict</tspan> </tspan><tspan xml:space="preserve" x="10" y="1274" class="output">│ <tspan class="bold fg1">×</tspan>  <tspan class="bold fg5">vl</tspan><tspan class="fg8">rryzpm</tspan> <tspan class="fg3">jjfan@example.com</tspan> <tspan class="fg6">2024-10-13 19:54:54</tspan> <tspan class="fg5">third</tspan> <tspan class="bold fg4">25</tspan><tspan class="fg8">2149ab</tspan> <tspan class="fg1">conflict</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1292" class="output">│ │  third </tspan><tspan xml:space="preserve" x="10" y="1292" class="output">│ │  third
</tspan><tspan xml:space="preserve" x="10" y="1310" class="output">○ │  <tspan class="bold fg5">p</tspan><tspan class="fg8">xssrovn</tspan> <tspan class="fg3">jjfan@example.com</tspan> <tspan class="fg6">2024-09-04 19:32:07</tspan> <tspan class="fg5">second</tspan> <tspan class="bold fg4">a</tspan><tspan class="fg8">8719aaa</tspan> </tspan><tspan xml:space="preserve" x="10" y="1310" class="output">○ │  <tspan class="bold fg5">vo</tspan><tspan class="fg8">zropow</tspan> <tspan class="fg3">jjfan@example.com</tspan> <tspan class="fg6">2024-10-13 19:54:54</tspan> <tspan class="fg5">second</tspan> <tspan class="bold fg4">5</tspan><tspan class="fg8">ccf5c89</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1328" class="output">├─╯  second </tspan><tspan xml:space="preserve" x="10" y="1328" class="output">├─╯  second
</tspan><tspan xml:space="preserve" x="10" y="1346" class="output">○  <tspan class="bold fg5">zw</tspan><tspan class="fg8">lynwuo</tspan> <tspan class="fg3">jjfan@example.com</tspan> <tspan class="fg6">2024-09-04 19:32:07</tspan> <tspan class="fg5">first</tspan> <tspan class="bold fg4">2</tspan><tspan class="fg8">3b66a7d</tspan> </tspan><tspan xml:space="preserve" x="10" y="1346" class="output">○  <tspan class="bold fg5">y</tspan><tspan class="fg8">zkyuwyx</tspan> <tspan class="fg3">jjfan@example.com</tspan> <tspan class="fg6">2024-10-13 19:54:53</tspan> <tspan class="fg5">first</tspan> <tspan class="bold fg4">d</tspan><tspan class="fg8">11b168f</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1364" class="output">│  first </tspan><tspan xml:space="preserve" x="10" y="1364" class="output">│  first
</tspan><tspan xml:space="preserve" x="10" y="1382" class="output"><tspan class="bold fg14">◆</tspan>  <tspan class="bold fg5">zz</tspan><tspan class="fg8">zzzzzz</tspan> <tspan class="fg2">root()</tspan> <tspan class="bold fg4">0</tspan><tspan class="fg8">0000000</tspan> </tspan><tspan xml:space="preserve" x="10" y="1382" class="output"><tspan class="bold fg14">◆</tspan>  <tspan class="bold fg5">z</tspan><tspan class="fg8">zzzzzzz</tspan> <tspan class="fg2">root()</tspan> <tspan class="bold fg4">0</tspan><tspan class="fg8">0000000</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1400" class="output"> </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"># Again, because the merge commit has the</tspan> </tspan><tspan xml:space="preserve" x="10" y="1418" class="output"><tspan class="fg2"># Again, because the merge commit has the</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1436" class="output"><tspan class="fg2"># changes from all three commits, it has no</tspan> </tspan><tspan xml:space="preserve" x="10" y="1436" class="output"><tspan class="fg2"># changes from all three commits, it has no</tspan>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 16 KiB

BIN
demos/operation_log.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 431 KiB

After

Width:  |  Height:  |  Size: 129 KiB

194
demos/operation_log.svg
View File

@ -1,5 +1,5 @@
<!-- Created with term-transcript v0.3.0 (https://github.com/slowli/term-transcript) --> <!-- Created with term-transcript v0.3.0 (https://github.com/slowli/term-transcript) -->
<svg viewBox="0 0 720 2432" width="720" height="2432" xmlns="http://www.w3.org/2000/svg"> <svg viewBox="0 0 720 2468" width="720" height="2468" xmlns="http://www.w3.org/2000/svg">
<style> <style>
.container { .container {
font: 14px Fira Code, Liberation Mono, SFMono-Regular, Consolas, Menlo, monospace; font: 14px Fira Code, Liberation Mono, SFMono-Regular, Consolas, Menlo, monospace;
@ -33,7 +33,7 @@
.fg15 { fill: #f2f2f2; } .output-bg .fg15 { stroke: #f2f2f2; } .fg15 { fill: #f2f2f2; } .output-bg .fg15 { stroke: #f2f2f2; }
</style> </style>
<rect width="100%" height="100%" y="0" rx="4.5" style="fill: #0c0c0c;" /> <rect width="100%" height="100%" y="0" rx="4.5" style="fill: #0c0c0c;" />
<svg x="0" y="10" width="720" height="2412" viewBox="0 0 720 2412"> <svg x="0" y="10" width="720" height="2448" viewBox="0 0 720 2448">
<g class="input-bg"></g> <g class="input-bg"></g>
<text class="container fg7"><tspan xml:space="preserve" x="10" y="14" class="output"> <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="32" class="output"><tspan class="fg2"># We are in the octocat/Hello-World repo.</tspan>
@ -41,108 +41,108 @@
</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="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="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="104" class="output">$ jj op log
</tspan><tspan xml:space="preserve" x="10" y="122" class="output"><tspan class="bold fg2">@</tspan>  <tspan class="bold fg12">d1254d09462f</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="122" class="output"><tspan class="bold fg2">@</tspan>  <tspan class="bold fg12">413275ffdc63</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@jujube</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">now, lasted less than a microsecond</tspan>
</tspan><tspan xml:space="preserve" x="10" y="140" class="output">│  <tspan class="bold">track remote branch test@origin</tspan> </tspan><tspan xml:space="preserve" x="10" y="140" class="output">│  <tspan class="bold">track remote bookmark test@origin</tspan>
</tspan><tspan xml:space="preserve" x="10" y="158" class="output">│  <tspan class="bold fg5">args: jj branch track test@origin</tspan> </tspan><tspan xml:space="preserve" x="10" y="158" class="output">│  <tspan class="bold fg5">args: jj bookmark track test@origin</tspan>
</tspan><tspan xml:space="preserve" x="10" y="176" class="output">○  <tspan class="fg4">e105c6ebf0c3</tspan> <tspan class="fg3">jjfan@jujube</tspan> <tspan class="fg6">now, lasted 1 millisecond</tspan> </tspan><tspan xml:space="preserve" x="10" y="176" class="output">○  <tspan class="fg4">ef68b3109893</tspan> <tspan class="fg3">jjfan@jujube</tspan> <tspan class="fg6">now, lasted 1 millisecond</tspan>
</tspan><tspan xml:space="preserve" x="10" y="194" class="output">│  forget branch octocat-patch-1 </tspan><tspan xml:space="preserve" x="10" y="194" class="output">│  forget bookmark octocat-patch-1
</tspan><tspan xml:space="preserve" x="10" y="212" class="output">│  <tspan class="fg5">args: jj branch forget octocat-patch-1</tspan> </tspan><tspan xml:space="preserve" x="10" y="212" class="output">│  <tspan class="fg5">args: jj bookmark forget octocat-patch-1</tspan>
</tspan><tspan xml:space="preserve" x="10" y="230" class="output">○  <tspan class="fg4">4c68250f080a</tspan> <tspan class="fg3">jjfan@jujube</tspan> <tspan class="fg6">now, lasted 3 milliseconds</tspan> </tspan><tspan xml:space="preserve" x="10" y="230" class="output">○  <tspan class="fg4">71f27ab6c268</tspan> <tspan class="fg3">jjfan@jujube</tspan> <tspan class="fg6">now, lasted 2 milliseconds</tspan>
</tspan><tspan xml:space="preserve" x="10" y="248" class="output">│  abandon commit b1b3f9723831141a31a1a7252a213e216ea76e56 </tspan><tspan xml:space="preserve" x="10" y="248" class="output">│  abandon commit b1b3f9723831141a31a1a7252a213e216ea76e56
</tspan><tspan xml:space="preserve" x="10" y="266" class="output">│  <tspan class="fg5">args: jj abandon --ignore-immutable octocat-patch-1@origin</tspan> </tspan><tspan xml:space="preserve" x="10" y="266" class="output">│  <tspan class="fg5">args: jj abandon --ignore-immutable octocat-patch-1@origin</tspan>
</tspan><tspan xml:space="preserve" x="10" y="284" class="output">○  <tspan class="fg4">5f2752210b21</tspan> <tspan class="fg3">jjfan@jujube</tspan> <tspan class="fg6">now, lasted 4 milliseconds</tspan> </tspan><tspan xml:space="preserve" x="10" y="284" class="output">○  <tspan class="fg4">2d2cbb3a7b4f</tspan> <tspan class="fg3">jjfan@jujube</tspan> <tspan class="fg6">now, lasted 3 milliseconds</tspan>
</tspan><tspan xml:space="preserve" x="10" y="302" class="output">│  check out git remote's default branch </tspan><tspan xml:space="preserve" x="10" y="302" class="output">│  check out git remote's default branch
</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="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">d9ebe25f912d</tspan> <tspan class="fg3">jjfan@jujube</tspan> <tspan class="fg6">now, lasted 794 milliseconds</tspan> </tspan><tspan xml:space="preserve" x="10" y="338" class="output">○  <tspan class="fg4">226119260984</tspan> <tspan class="fg3">jjfan@jujube</tspan> <tspan class="fg6">now, lasted 540 milliseconds</tspan>
</tspan><tspan xml:space="preserve" x="10" y="356" class="output">│  fetch from git remote into empty repo </tspan><tspan xml:space="preserve" x="10" y="356" class="output">│  fetch from git remote into empty repo
</tspan><tspan xml:space="preserve" x="10" y="374" class="output">│  <tspan class="fg5">args: jj git clone https://github.com/octocat/Hello-World</tspan> </tspan><tspan xml:space="preserve" x="10" y="374" class="output">│  <tspan class="fg5">args: jj git clone https://github.com/octocat/Hello-World</tspan>
</tspan><tspan xml:space="preserve" x="10" y="392" class="output">○  <tspan class="fg4">79c60d07e3db</tspan> <tspan class="fg3">jjfan@jujube</tspan> <tspan class="fg6">now, lasted 14 milliseconds</tspan> </tspan><tspan xml:space="preserve" x="10" y="392" class="output">○  <tspan class="fg4">3ec4bb144f11</tspan> <tspan class="fg3">jjfan@jujube</tspan> <tspan class="fg6">now, lasted 15 milliseconds</tspan>
</tspan><tspan xml:space="preserve" x="10" y="410" class="output">│  add workspace 'default' </tspan><tspan xml:space="preserve" x="10" y="410" class="output">│  add workspace 'default'
</tspan><tspan xml:space="preserve" x="10" y="428" class="output">○  <tspan class="fg4">4b03a8ea38cb</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="428" class="output">○  <tspan class="fg4">000000000000</tspan> <tspan class="fg2">root()</tspan>
</tspan><tspan xml:space="preserve" x="10" y="446" class="output">│  initialize repo </tspan><tspan xml:space="preserve" x="10" y="446" class="output">
</tspan><tspan xml:space="preserve" x="10" y="464" class="output">○  <tspan class="fg4">000000000000</tspan> <tspan class="fg2">root()</tspan> </tspan><tspan xml:space="preserve" x="10" y="464" class="output"><tspan class="fg2"># We are going to make some changes to show</tspan>
</tspan><tspan xml:space="preserve" x="10" y="482" class="output"> </tspan><tspan xml:space="preserve" x="10" y="482" 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="500" class="output"><tspan class="fg2"># We are going to make some changes to show</tspan> </tspan><tspan xml:space="preserve" x="10" y="500" class="output"><tspan class="fg2"># a description, and rebase onto the "test" bookmark:</tspan>
</tspan><tspan xml:space="preserve" x="10" y="518" 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="518" class="output">
</tspan><tspan xml:space="preserve" x="10" y="536" class="output"><tspan class="fg2"># a description, and rebase onto the "test" branch:</tspan> </tspan><tspan xml:space="preserve" x="10" y="536" class="output">$ echo stuff &gt; new-file
</tspan><tspan xml:space="preserve" x="10" y="554" class="output"> </tspan><tspan xml:space="preserve" x="10" y="554" class="output">$ jj describe -m stuff
</tspan><tspan xml:space="preserve" x="10" y="572" class="output">$ echo stuff &gt; new-file </tspan><tspan xml:space="preserve" x="10" y="572" class="output">Working copy now at: <tspan class="bold fg13">w</tspan><tspan class="bold fg8">yqozymx</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">a</tspan><tspan class="bold fg8">e764306</tspan><tspan class="bold"> stuff</tspan>
</tspan><tspan xml:space="preserve" x="10" y="590" class="output">$ jj describe -m stuff </tspan><tspan xml:space="preserve" x="10" y="590" class="output">Parent commit      : <tspan class="bold fg5">o</tspan><tspan class="fg8">rrkosyo</tspan> <tspan class="bold fg4">7</tspan><tspan class="fg8">fd1a60b</tspan> <tspan class="fg5">master</tspan><tspan class="fg8"> | </tspan><tspan class="fg2">(empty)</tspan> Merge pull request #6 fr<tspan class="hard-br" rotate="45" dx=".1em" dy="-.2em">↓</tspan>
</tspan><tspan xml:space="preserve" x="10" y="608" class="output">Working copy now at: <tspan class="bold fg13">x</tspan><tspan class="bold fg8">kuyvtxv</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">7fb</tspan><tspan class="bold fg8">9281a</tspan><tspan class="bold"> stuff</tspan> </tspan><tspan xml:space="preserve" x="10" y="608" class="output">om Spaceghost/patch-1
</tspan><tspan xml:space="preserve" x="10" y="626" class="output">Parent commit      : <tspan class="bold fg5">o</tspan><tspan class="fg8">rrkosyo</tspan> <tspan class="bold fg4">7fd</tspan><tspan class="fg8">1a60b</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="626" class="output">$ jj rebase -d test
</tspan><tspan xml:space="preserve" x="10" y="644" class="output">om Spaceghost/patch-1 </tspan><tspan xml:space="preserve" x="10" y="644" class="output">Rebased 1 commits
</tspan><tspan xml:space="preserve" x="10" y="662" class="output">$ jj rebase -d test </tspan><tspan xml:space="preserve" x="10" y="662" class="output">Working copy now at: <tspan class="bold fg13">w</tspan><tspan class="bold fg8">yqozymx</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">c</tspan><tspan class="bold fg8">816cafa</tspan><tspan class="bold"> stuff</tspan>
</tspan><tspan xml:space="preserve" x="10" y="680" class="output">Rebased 1 commits </tspan><tspan xml:space="preserve" x="10" y="680" class="output">Parent commit      : <tspan class="bold fg5">k</tspan><tspan class="fg8">owxouwz</tspan> <tspan class="bold fg4">b</tspan><tspan class="fg8">3cbd5bb</tspan> <tspan class="fg5">test</tspan><tspan class="fg8"> | </tspan>Create CONTRIBUTING.md
</tspan><tspan xml:space="preserve" x="10" y="698" class="output">Working copy now at: <tspan class="bold fg13">x</tspan><tspan class="bold fg8">kuyvtxv</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">d</tspan><tspan class="bold fg8">4a43058</tspan><tspan class="bold"> stuff</tspan> </tspan><tspan xml:space="preserve" x="10" y="698" class="output">Added 1 files, modified 0 files, removed 0 files
</tspan><tspan xml:space="preserve" x="10" y="716" class="output">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="716" class="output">
</tspan><tspan xml:space="preserve" x="10" y="734" class="output">Added 1 files, modified 0 files, removed 0 files </tspan><tspan xml:space="preserve" x="10" y="734" class="output"><tspan class="fg2"># We are now going to make another change off of</tspan>
</tspan><tspan xml:space="preserve" x="10" y="752" class="output"> </tspan><tspan xml:space="preserve" x="10" y="752" class="output"><tspan class="fg2"># master:</tspan>
</tspan><tspan xml:space="preserve" x="10" y="770" class="output"><tspan class="fg2"># We are now going to make another change off of</tspan> </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"># master:</tspan> </tspan><tspan xml:space="preserve" x="10" y="788" class="output">$ jj new master
</tspan><tspan xml:space="preserve" x="10" y="806" class="output"> </tspan><tspan xml:space="preserve" x="10" y="806" class="output">Working copy now at: <tspan class="bold fg13">t</tspan><tspan class="bold fg8">soomuvq</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">a</tspan><tspan class="bold fg8">a67e541</tspan><tspan class="bold"> </tspan><tspan class="bold fg10">(empty)</tspan><tspan class="bold"> </tspan><tspan class="bold fg10">(no description set)</tspan>
</tspan><tspan xml:space="preserve" x="10" y="824" class="output">$ jj new master </tspan><tspan xml:space="preserve" x="10" y="824" class="output">Parent commit      : <tspan class="bold fg5">o</tspan><tspan class="fg8">rrkosyo</tspan> <tspan class="bold fg4">7</tspan><tspan class="fg8">fd1a60b</tspan> <tspan class="fg5">master</tspan><tspan class="fg8"> | </tspan><tspan class="fg2">(empty)</tspan> Merge pull request #6 fr<tspan class="hard-br" rotate="45" dx=".1em" dy="-.2em">↓</tspan>
</tspan><tspan xml:space="preserve" x="10" y="842" class="output">Working copy now at: <tspan class="bold fg13">u</tspan><tspan class="bold fg8">suulptu</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">c</tspan><tspan class="bold fg8">941f1bb</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="842" class="output">om Spaceghost/patch-1
</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="860" class="output">Added 0 files, modified 0 files, removed 2 files
</tspan><tspan xml:space="preserve" x="10" y="878" class="output">om Spaceghost/patch-1 </tspan><tspan xml:space="preserve" x="10" y="878" class="output">$ jj describe -m "other stuff"
</tspan><tspan xml:space="preserve" x="10" y="896" class="output">Added 0 files, modified 0 files, removed 2 files </tspan><tspan xml:space="preserve" x="10" y="896" class="output">Working copy now at: <tspan class="bold fg13">t</tspan><tspan class="bold fg8">soomuvq</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">1</tspan><tspan class="bold fg8">44081d4</tspan><tspan class="bold"> </tspan><tspan class="bold fg10">(empty)</tspan><tspan class="bold"> other stuff</tspan>
</tspan><tspan xml:space="preserve" x="10" y="914" class="output">$ jj describe -m "other stuff" </tspan><tspan xml:space="preserve" x="10" y="914" class="output">Parent commit      : <tspan class="bold fg5">o</tspan><tspan class="fg8">rrkosyo</tspan> <tspan class="bold fg4">7</tspan><tspan class="fg8">fd1a60b</tspan> <tspan class="fg5">master</tspan><tspan class="fg8"> | </tspan><tspan class="fg2">(empty)</tspan> Merge pull request #6 fr<tspan class="hard-br" rotate="45" dx=".1em" dy="-.2em">↓</tspan>
</tspan><tspan xml:space="preserve" x="10" y="932" class="output">Working copy now at: <tspan class="bold fg13">u</tspan><tspan class="bold fg8">suulptu</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">dc</tspan><tspan class="bold fg8">950629</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="932" class="output">om Spaceghost/patch-1
</tspan><tspan xml:space="preserve" x="10" y="950" 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="950" class="output">
</tspan><tspan xml:space="preserve" x="10" y="968" class="output">om Spaceghost/patch-1 </tspan><tspan xml:space="preserve" x="10" y="968" class="output"><tspan class="fg2"># The repo now looks like this:</tspan>
</tspan><tspan xml:space="preserve" x="10" y="986" class="output"> </tspan><tspan xml:space="preserve" x="10" y="986" class="output">
</tspan><tspan xml:space="preserve" x="10" y="1004" class="output"><tspan class="fg2"># The repo now looks like this:</tspan> </tspan><tspan xml:space="preserve" x="10" y="1004" class="output">$ jj log
</tspan><tspan xml:space="preserve" x="10" y="1022" class="output"> </tspan><tspan xml:space="preserve" x="10" y="1022" class="output"><tspan class="bold fg2">@</tspan>  <tspan class="bold fg13">t</tspan><tspan class="bold fg8">soomuvq</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@example.com</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">2024-10-13 19:54:55</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">1</tspan><tspan class="bold fg8">44081d4</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1040" class="output">$ jj log </tspan><tspan xml:space="preserve" x="10" y="1040" class="output">│  <tspan class="bold fg10">(empty)</tspan><tspan class="bold"> other stuff</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1058" class="output"><tspan class="bold fg2">@</tspan>  <tspan class="bold fg13">u</tspan><tspan class="bold fg8">suulptu</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@example.com</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">2024-09-04 19:21:10</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">dc</tspan><tspan class="bold fg8">950629</tspan> </tspan><tspan xml:space="preserve" x="10" y="1058" class="output">│ ○  <tspan class="bold fg5">w</tspan><tspan class="fg8">yqozymx</tspan> <tspan class="fg3">jjfan@example.com</tspan> <tspan class="fg6">2024-10-13 19:54:55</tspan> <tspan class="bold fg4">c</tspan><tspan class="fg8">816cafa</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1076" class="output">│  <tspan class="bold fg10">(empty)</tspan><tspan class="bold"> other stuff</tspan> </tspan><tspan xml:space="preserve" x="10" y="1076" class="output">│ │  stuff
</tspan><tspan xml:space="preserve" x="10" y="1094" class="output">│ ○  <tspan class="bold fg5">x</tspan><tspan class="fg8">kuyvtxv</tspan> <tspan class="fg3">jjfan@example.com</tspan> <tspan class="fg6">2024-09-04 19:21:10</tspan> <tspan class="bold fg4">d4</tspan><tspan class="fg8">a43058</tspan> </tspan><tspan xml:space="preserve" x="10" y="1094" class="output">│ ○  <tspan class="bold fg5">k</tspan><tspan class="fg8">owxouwz</tspan> <tspan class="fg3">octocat@nowhere.com</tspan> <tspan class="fg6">2014-06-10 15:22:26</tspan> <tspan class="fg5">test</tspan> <tspan class="bold fg4">b</tspan><tspan class="fg8">3cbd5bb</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1112" class="output">│ │  stuff </tspan><tspan xml:space="preserve" x="10" y="1112" class="output">├─╯  Create CONTRIBUTING.md
</tspan><tspan xml:space="preserve" x="10" y="1130" class="output">│ ○  <tspan class="bold fg5">k</tspan><tspan class="fg8">owxouwz</tspan> <tspan class="fg3">octocat@nowhere.com</tspan> <tspan class="fg6">2014-06-10 15:22:26</tspan> <tspan class="fg5">test</tspan> <tspan class="bold fg4">b</tspan><tspan class="fg8">3cbd5bb</tspan> </tspan><tspan xml:space="preserve" x="10" y="1130" class="output"><tspan class="bold fg14">◆</tspan>  <tspan class="bold fg5">o</tspan><tspan class="fg8">rrkosyo</tspan> <tspan class="fg3">octocat@nowhere.com</tspan> <tspan class="fg6">2012-03-06 16:06:50</tspan> <tspan class="fg5">master</tspan> <tspan class="bold fg4">7</tspan><tspan class="fg8">fd1a60b</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1148" class="output">├─╯  Create CONTRIBUTING.md </tspan><tspan xml:space="preserve" x="10" y="1148" class="output">│  <tspan class="fg2">(empty)</tspan> Merge pull request #6 from Spaceghost/patch-1
</tspan><tspan xml:space="preserve" x="10" y="1166" class="output"><tspan class="bold fg14">◆</tspan>  <tspan class="bold fg5">o</tspan><tspan class="fg8">rrkosyo</tspan> <tspan class="fg3">octocat@nowhere.com</tspan> <tspan class="fg6">2012-03-06 16:06:50</tspan> <tspan class="fg5">master</tspan> <tspan class="bold fg4">7</tspan><tspan class="fg8">fd1a60b</tspan> </tspan><tspan xml:space="preserve" x="10" y="1166" class="output">~
</tspan><tspan xml:space="preserve" x="10" y="1184" class="output">│  <tspan class="fg2">(empty)</tspan> Merge pull request #6 from Spaceghost/patch-1 </tspan><tspan xml:space="preserve" x="10" y="1184" class="output">
</tspan><tspan xml:space="preserve" x="10" y="1202" class="output">~ </tspan><tspan xml:space="preserve" x="10" y="1202" class="output"><tspan class="fg2"># The most recent portion of the operation log</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1220" class="output"> </tspan><tspan xml:space="preserve" x="10" y="1220" class="output"><tspan class="fg2"># is:</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1238" class="output"><tspan class="fg2"># The most recent portion of the operation log</tspan> </tspan><tspan xml:space="preserve" x="10" y="1238" class="output">
</tspan><tspan xml:space="preserve" x="10" y="1256" class="output"><tspan class="fg2"># is:</tspan> </tspan><tspan xml:space="preserve" x="10" y="1256" class="output">$ jj op log --limit 4
</tspan><tspan xml:space="preserve" x="10" y="1274" class="output"> </tspan><tspan xml:space="preserve" x="10" y="1274" class="output"><tspan class="bold fg2">@</tspan>  <tspan class="bold fg12">9c3febcd07fe</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@jujube</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">now, lasted 13 milliseconds</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1292" class="output">$ jj op log --limit 4 </tspan><tspan xml:space="preserve" x="10" y="1292" class="output">│  <tspan class="bold">describe commit aa67e54144e120ceb06055d47ac770f5bd7505f3</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1310" class="output"><tspan class="bold fg2">@</tspan>  <tspan class="bold fg12">a218c1df176c</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@jujube</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">now, lasted 16 milliseconds</tspan> </tspan><tspan xml:space="preserve" x="10" y="1310" class="output">│  <tspan class="bold fg5">args: jj describe -m 'other stuff'</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1328" class="output">│  <tspan class="bold">describe commit c941f1bb24197001c271b02a37f7ca28f36e17b0</tspan> </tspan><tspan xml:space="preserve" x="10" y="1328" class="output">○  <tspan class="fg4">73eed4a6c928</tspan> <tspan class="fg3">jjfan@jujube</tspan> <tspan class="fg6">now, lasted 14 milliseconds</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1346" class="output">│  <tspan class="bold fg5">args: jj describe -m 'other stuff'</tspan> </tspan><tspan xml:space="preserve" x="10" y="1346" class="output">│  new empty commit
</tspan><tspan xml:space="preserve" x="10" y="1364" class="output">○  <tspan class="fg4">fa4e0babc454</tspan> <tspan class="fg3">jjfan@jujube</tspan> <tspan class="fg6">now, lasted 14 milliseconds</tspan> </tspan><tspan xml:space="preserve" x="10" y="1364" class="output">│  <tspan class="fg5">args: jj new master</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1382" class="output">│  new empty commit </tspan><tspan xml:space="preserve" x="10" y="1382" class="output">○  <tspan class="fg4">78f44786ada8</tspan> <tspan class="fg3">jjfan@jujube</tspan> <tspan class="fg6">now, lasted 14 milliseconds</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1400" class="output">│  <tspan class="fg5">args: jj new master</tspan> </tspan><tspan xml:space="preserve" x="10" y="1400" class="output">│  rebase commit ae764306f7544e76e049d0a271449fa986e22de9 and descendants
</tspan><tspan xml:space="preserve" x="10" y="1418" class="output">○  <tspan class="fg4">9c96ec25f257</tspan> <tspan class="fg3">jjfan@jujube</tspan> <tspan class="fg6">now, lasted 15 milliseconds</tspan> </tspan><tspan xml:space="preserve" x="10" y="1418" class="output">│  <tspan class="fg5">args: jj rebase -d test</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1436" class="output">│  rebase commit 7fb9281afa10aa6b40e5b730a459cc53ebc9c129 and descendants </tspan><tspan xml:space="preserve" x="10" y="1436" class="output">○  <tspan class="fg4">95902a54354d</tspan> <tspan class="fg3">jjfan@jujube</tspan> <tspan class="fg6">now, lasted 2 milliseconds</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1454" class="output">│  <tspan class="fg5">args: jj rebase -d test</tspan> </tspan><tspan xml:space="preserve" x="10" y="1454" class="output">│  describe commit 8756f29849ccaf0024ff98c0605bbb1289c2992f
</tspan><tspan xml:space="preserve" x="10" y="1472" class="output">○  <tspan class="fg4">9e8206736a23</tspan> <tspan class="fg3">jjfan@jujube</tspan> <tspan class="fg6">now, lasted 2 milliseconds</tspan> </tspan><tspan xml:space="preserve" x="10" y="1472" class="output">│  <tspan class="fg5">args: jj describe -m stuff</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1490" class="output">│  describe commit 1bc2da583b790b6288941b6858d5ecbbc9cee3b4 </tspan><tspan xml:space="preserve" x="10" y="1490" class="output">
</tspan><tspan xml:space="preserve" x="10" y="1508" class="output">│  <tspan class="fg5">args: jj describe -m stuff</tspan> </tspan><tspan xml:space="preserve" x="10" y="1508" class="output"><tspan class="fg2"># Let's undo that rebase operation:</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1526" class="output"> </tspan><tspan xml:space="preserve" x="10" y="1526" class="output">
</tspan><tspan xml:space="preserve" x="10" y="1544" class="output"><tspan class="fg2"># Let's undo that rebase operation:</tspan> </tspan><tspan xml:space="preserve" x="10" y="1544" class="output">$ jj undo 78f44
</tspan><tspan xml:space="preserve" x="10" y="1562" class="output"> </tspan><tspan xml:space="preserve" x="10" y="1562" class="output">Undid operation: <tspan class="fg4">78f44786ada8</tspan> (<tspan class="fg6">2024-10-13 19:54:55</tspan>) rebase commit ae764306f7544e<tspan class="hard-br" rotate="45" dx=".1em" dy="-.2em">↓</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1580" class="output">$ jj undo 9c96e </tspan><tspan xml:space="preserve" x="10" y="1580" class="output">76e049d0a271449fa986e22de9 and descendants
</tspan><tspan xml:space="preserve" x="10" y="1598" class="output"> </tspan><tspan xml:space="preserve" x="10" y="1598" class="output">
</tspan><tspan xml:space="preserve" x="10" y="1616" class="output"><tspan class="fg2"># Note that only the rebase was undone, and the</tspan> </tspan><tspan xml:space="preserve" x="10" y="1616" class="output"><tspan class="fg2"># Note that only the rebase was undone, and the</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1634" class="output"><tspan class="fg2"># subsequent "other stuff" change was not undone:</tspan> </tspan><tspan xml:space="preserve" x="10" y="1634" class="output"><tspan class="fg2"># subsequent "other stuff" change was not undone:</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1652" class="output"> </tspan><tspan xml:space="preserve" x="10" y="1652" class="output">
</tspan><tspan xml:space="preserve" x="10" y="1670" class="output">$ jj log </tspan><tspan xml:space="preserve" x="10" y="1670" class="output">$ jj log
</tspan><tspan xml:space="preserve" x="10" y="1688" class="output"><tspan class="bold fg2">@</tspan>  <tspan class="bold fg13">u</tspan><tspan class="bold fg8">suulptu</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@example.com</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">2024-09-04 19:21:10</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">d</tspan><tspan class="bold fg8">c950629</tspan> </tspan><tspan xml:space="preserve" x="10" y="1688" class="output"><tspan class="bold fg2">@</tspan>  <tspan class="bold fg13">t</tspan><tspan class="bold fg8">soomuvq</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@example.com</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">2024-10-13 19:54:55</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">1</tspan><tspan class="bold fg8">44081d4</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1706" class="output">│  <tspan class="bold fg10">(empty)</tspan><tspan class="bold"> other stuff</tspan> </tspan><tspan xml:space="preserve" x="10" y="1706" class="output">│  <tspan class="bold fg10">(empty)</tspan><tspan class="bold"> other stuff</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1724" class="output">│ ○  <tspan class="bold fg5">x</tspan><tspan class="fg8">kuyvtxv</tspan> <tspan class="fg3">jjfan@example.com</tspan> <tspan class="fg6">2024-09-04 19:21:10</tspan> <tspan class="bold fg4">7fb</tspan><tspan class="fg8">9281a</tspan> </tspan><tspan xml:space="preserve" x="10" y="1724" class="output">│ ○  <tspan class="bold fg5">w</tspan><tspan class="fg8">yqozymx</tspan> <tspan class="fg3">jjfan@example.com</tspan> <tspan class="fg6">2024-10-13 19:54:55</tspan> <tspan class="bold fg4">a</tspan><tspan class="fg8">e764306</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1742" class="output">├─╯  stuff </tspan><tspan xml:space="preserve" x="10" y="1742" class="output">├─╯  stuff
</tspan><tspan xml:space="preserve" x="10" y="1760" class="output">│ ○  <tspan class="bold fg5">k</tspan><tspan class="fg8">owxouwz</tspan> <tspan class="fg3">octocat@nowhere.com</tspan> <tspan class="fg6">2014-06-10 15:22:26</tspan> <tspan class="fg5">test</tspan> <tspan class="bold fg4">b</tspan><tspan class="fg8">3cbd5bb</tspan> </tspan><tspan xml:space="preserve" x="10" y="1760" class="output">│ ○  <tspan class="bold fg5">k</tspan><tspan class="fg8">owxouwz</tspan> <tspan class="fg3">octocat@nowhere.com</tspan> <tspan class="fg6">2014-06-10 15:22:26</tspan> <tspan class="fg5">test</tspan> <tspan class="bold fg4">b</tspan><tspan class="fg8">3cbd5bb</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1778" class="output">├─╯  Create CONTRIBUTING.md </tspan><tspan xml:space="preserve" x="10" y="1778" class="output">├─╯  Create CONTRIBUTING.md
</tspan><tspan xml:space="preserve" x="10" y="1796" class="output"><tspan class="bold fg14">◆</tspan>  <tspan class="bold fg5">o</tspan><tspan class="fg8">rrkosyo</tspan> <tspan class="fg3">octocat@nowhere.com</tspan> <tspan class="fg6">2012-03-06 16:06:50</tspan> <tspan class="fg5">master</tspan> <tspan class="bold fg4">7fd</tspan><tspan class="fg8">1a60b</tspan> </tspan><tspan xml:space="preserve" x="10" y="1796" class="output"><tspan class="bold fg14">◆</tspan>  <tspan class="bold fg5">o</tspan><tspan class="fg8">rrkosyo</tspan> <tspan class="fg3">octocat@nowhere.com</tspan> <tspan class="fg6">2012-03-06 16:06:50</tspan> <tspan class="fg5">master</tspan> <tspan class="bold fg4">7</tspan><tspan class="fg8">fd1a60b</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1814" class="output">│  <tspan class="fg2">(empty)</tspan> Merge pull request #6 from Spaceghost/patch-1 </tspan><tspan xml:space="preserve" x="10" y="1814" class="output">│  <tspan class="fg2">(empty)</tspan> Merge pull request #6 from Spaceghost/patch-1
</tspan><tspan xml:space="preserve" x="10" y="1832" class="output">~ </tspan><tspan xml:space="preserve" x="10" y="1832" class="output">~
</tspan><tspan xml:space="preserve" x="10" y="1850" class="output"> </tspan><tspan xml:space="preserve" x="10" y="1850" class="output">
</tspan><tspan xml:space="preserve" x="10" y="1868" class="output"><tspan class="fg2"># We can also see what the repo looked like</tspan> </tspan><tspan xml:space="preserve" x="10" y="1868" class="output"><tspan class="fg2"># We can also see what the repo looked like</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1886" class="output"><tspan class="fg2"># after the rebase operation:</tspan> </tspan><tspan xml:space="preserve" x="10" y="1886" class="output"><tspan class="fg2"># after the rebase operation:</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1904" class="output"> </tspan><tspan xml:space="preserve" x="10" y="1904" class="output">
</tspan><tspan xml:space="preserve" x="10" y="1922" class="output">$ jj --at-op 9c96e log </tspan><tspan xml:space="preserve" x="10" y="1922" class="output">$ jj --at-op 78f44 log
</tspan><tspan xml:space="preserve" x="10" y="1940" class="output"><tspan class="bold fg2">@</tspan>  <tspan class="bold fg13">x</tspan><tspan class="bold fg8">kuyvtxv</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@example.com</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">2024-09-04 19:21:10</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">d</tspan><tspan class="bold fg8">4a43058</tspan> </tspan><tspan xml:space="preserve" x="10" y="1940" class="output"><tspan class="bold fg2">@</tspan>  <tspan class="bold fg13">w</tspan><tspan class="bold fg8">yqozymx</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@example.com</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">2024-10-13 19:54:55</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">c</tspan><tspan class="bold fg8">816cafa</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1958" class="output">│  <tspan class="bold">stuff</tspan> </tspan><tspan xml:space="preserve" x="10" y="1958" class="output">│  <tspan class="bold">stuff</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1976" class="output">○  <tspan class="bold fg5">k</tspan><tspan class="fg8">owxouwz</tspan> <tspan class="fg3">octocat@nowhere.com</tspan> <tspan class="fg6">2014-06-10 15:22:26</tspan> <tspan class="fg5">test</tspan> <tspan class="bold fg4">b</tspan><tspan class="fg8">3cbd5bb</tspan> </tspan><tspan xml:space="preserve" x="10" y="1976" class="output">○  <tspan class="bold fg5">k</tspan><tspan class="fg8">owxouwz</tspan> <tspan class="fg3">octocat@nowhere.com</tspan> <tspan class="fg6">2014-06-10 15:22:26</tspan> <tspan class="fg5">test</tspan> <tspan class="bold fg4">b</tspan><tspan class="fg8">3cbd5bb</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1994" class="output">│  Create CONTRIBUTING.md </tspan><tspan xml:space="preserve" x="10" y="1994" class="output">│  Create CONTRIBUTING.md
@ -153,22 +153,24 @@
</tspan><tspan xml:space="preserve" x="10" y="2084" class="output"><tspan class="fg2"># Let's say we instead want to go back to the</tspan> </tspan><tspan xml:space="preserve" x="10" y="2084" class="output"><tspan class="fg2"># Let's say we instead want to go back to the</tspan>
</tspan><tspan xml:space="preserve" x="10" y="2102" class="output"><tspan class="fg2"># state of the repo right after the rebase:</tspan> </tspan><tspan xml:space="preserve" x="10" y="2102" class="output"><tspan class="fg2"># state of the repo right after the rebase:</tspan>
</tspan><tspan xml:space="preserve" x="10" y="2120" class="output"> </tspan><tspan xml:space="preserve" x="10" y="2120" class="output">
</tspan><tspan xml:space="preserve" x="10" y="2138" class="output">$ jj op restore 9c96e </tspan><tspan xml:space="preserve" x="10" y="2138" class="output">$ jj op restore 78f44
</tspan><tspan xml:space="preserve" x="10" y="2156" class="output">Working copy now at: <tspan class="bold fg13">x</tspan><tspan class="bold fg8">kuyvtxv</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">d</tspan><tspan class="bold fg8">4a43058</tspan><tspan class="bold"> stuff</tspan> </tspan><tspan xml:space="preserve" x="10" y="2156" class="output">Restored to operation: <tspan class="fg4">78f44786ada8</tspan> (<tspan class="fg6">2024-10-13 19:54:55</tspan>) rebase commit ae764306<tspan class="hard-br" rotate="45" dx=".1em" dy="-.2em">↓</tspan>
</tspan><tspan xml:space="preserve" x="10" y="2174" class="output">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="2174" class="output">f7544e76e049d0a271449fa986e22de9 and descendants
</tspan><tspan xml:space="preserve" x="10" y="2192" class="output">Added 2 files, modified 0 files, removed 0 files </tspan><tspan xml:space="preserve" x="10" y="2192" class="output">Working copy now at: <tspan class="bold fg13">w</tspan><tspan class="bold fg8">yqozymx</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">c</tspan><tspan class="bold fg8">816cafa</tspan><tspan class="bold"> stuff</tspan>
</tspan><tspan xml:space="preserve" x="10" y="2210" class="output"> </tspan><tspan xml:space="preserve" x="10" y="2210" class="output">Parent commit      : <tspan class="bold fg5">k</tspan><tspan class="fg8">owxouwz</tspan> <tspan class="bold fg4">b</tspan><tspan class="fg8">3cbd5bb</tspan> <tspan class="fg5">test</tspan><tspan class="fg8"> | </tspan>Create CONTRIBUTING.md
</tspan><tspan xml:space="preserve" x="10" y="2228" class="output"><tspan class="fg2"># We're now back to before the "other stuff"</tspan> </tspan><tspan xml:space="preserve" x="10" y="2228" class="output">Added 2 files, modified 0 files, removed 0 files
</tspan><tspan xml:space="preserve" x="10" y="2246" class="output"><tspan 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"> </tspan><tspan xml:space="preserve" x="10" y="2264" class="output"><tspan class="fg2"># We're now back to before the "other stuff"</tspan>
</tspan><tspan xml:space="preserve" x="10" y="2282" class="output">$ jj log </tspan><tspan xml:space="preserve" x="10" y="2282" class="output"><tspan class="fg2"># change existed:</tspan>
</tspan><tspan xml:space="preserve" x="10" y="2300" class="output"><tspan class="bold fg2">@</tspan>  <tspan class="bold fg13">x</tspan><tspan class="bold fg8">kuyvtxv</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@example.com</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">2024-09-04 19:21:10</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">d</tspan><tspan class="bold fg8">4a43058</tspan> </tspan><tspan xml:space="preserve" x="10" y="2300" class="output">
</tspan><tspan xml:space="preserve" x="10" y="2318" class="output">│  <tspan class="bold">stuff</tspan> </tspan><tspan xml:space="preserve" x="10" y="2318" class="output">$ jj log
</tspan><tspan xml:space="preserve" x="10" y="2336" class="output">○  <tspan class="bold fg5">k</tspan><tspan class="fg8">owxouwz</tspan> <tspan class="fg3">octocat@nowhere.com</tspan> <tspan class="fg6">2014-06-10 15:22:26</tspan> <tspan class="fg5">test</tspan> <tspan class="bold fg4">b</tspan><tspan class="fg8">3cbd5bb</tspan> </tspan><tspan xml:space="preserve" x="10" y="2336" class="output"><tspan class="bold fg2">@</tspan>  <tspan class="bold fg13">w</tspan><tspan class="bold fg8">yqozymx</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@example.com</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">2024-10-13 19:54:55</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">c</tspan><tspan class="bold fg8">816cafa</tspan>
</tspan><tspan xml:space="preserve" x="10" y="2354" class="output">│  Create CONTRIBUTING.md </tspan><tspan xml:space="preserve" x="10" y="2354" class="output">│  <tspan class="bold">stuff</tspan>
</tspan><tspan xml:space="preserve" x="10" y="2372" class="output"><tspan class="bold fg14">◆</tspan>  <tspan class="bold fg5">o</tspan><tspan class="fg8">rrkosyo</tspan> <tspan class="fg3">octocat@nowhere.com</tspan> <tspan class="fg6">2012-03-06 16:06:50</tspan> <tspan class="fg5">master</tspan> <tspan class="bold fg4">7</tspan><tspan class="fg8">fd1a60b</tspan> </tspan><tspan xml:space="preserve" x="10" y="2372" class="output">○  <tspan class="bold fg5">k</tspan><tspan class="fg8">owxouwz</tspan> <tspan class="fg3">octocat@nowhere.com</tspan> <tspan class="fg6">2014-06-10 15:22:26</tspan> <tspan class="fg5">test</tspan> <tspan class="bold fg4">b</tspan><tspan class="fg8">3cbd5bb</tspan>
</tspan><tspan xml:space="preserve" x="10" y="2390" class="output">│  <tspan class="fg2">(empty)</tspan> Merge pull request #6 from Spaceghost/patch-1 </tspan><tspan xml:space="preserve" x="10" y="2390" class="output">│  Create CONTRIBUTING.md
</tspan><tspan xml:space="preserve" x="10" y="2408" class="output">~ </tspan><tspan xml:space="preserve" x="10" y="2408" class="output"><tspan class="bold fg14">◆</tspan>  <tspan class="bold fg5">o</tspan><tspan class="fg8">rrkosyo</tspan> <tspan class="fg3">octocat@nowhere.com</tspan> <tspan class="fg6">2012-03-06 16:06:50</tspan> <tspan class="fg5">master</tspan> <tspan class="bold fg4">7</tspan><tspan class="fg8">fd1a60b</tspan>
</tspan><tspan xml:space="preserve" x="10" y="2426" class="output">│  <tspan class="fg2">(empty)</tspan> Merge pull request #6 from Spaceghost/patch-1
</tspan><tspan xml:space="preserve" x="10" y="2444" class="output">~
</tspan></text> </tspan></text>
</svg> </svg>
</svg> </svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 24 KiB

After

Width:  |  Height:  |  Size: 24 KiB

BIN
demos/resolve_conflicts.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 234 KiB

After

Width:  |  Height:  |  Size: 71 KiB

52
demos/resolve_conflicts.svg
View File

@ -36,13 +36,13 @@
<svg x="0" y="10" width="720" height="1638" viewBox="0 0 720 1638"> <svg x="0" y="10" width="720" height="1638" viewBox="0 0 720 1638">
<g class="input-bg"></g> <g class="input-bg"></g>
<text class="container fg7"><tspan xml:space="preserve" x="10" y="14" class="output"> <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="32" class="output"><tspan class="fg2"># We are on the master branch of the octocat/Hello-World repo,</tspan>
</tspan><tspan xml:space="preserve" x="10" y="50" class="output"><tspan class="fg2"># octocat/Hello-World repo:</tspan> </tspan><tspan xml:space="preserve" x="10" y="50" class="output"><tspan class="fg2"># represented by the "master" bookmark on the parent commit.</tspan>
</tspan><tspan xml:space="preserve" x="10" y="68" class="output"> </tspan><tspan xml:space="preserve" x="10" y="68" class="output">
</tspan><tspan xml:space="preserve" x="10" y="86" class="output">$ jj log </tspan><tspan xml:space="preserve" x="10" y="86" class="output">$ jj log
</tspan><tspan xml:space="preserve" x="10" y="104" class="output"><tspan class="bold fg2">@</tspan>  <tspan class="bold fg13">ox</tspan><tspan class="bold fg8">mwolvs</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@example.com</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">2024-09-04 19:21:11</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">1</tspan><tspan class="bold fg8">c12dfd3</tspan> </tspan><tspan xml:space="preserve" x="10" y="104" class="output"><tspan class="bold fg2">@</tspan>  <tspan class="bold fg13">t</tspan><tspan class="bold fg8">mnxzsns</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@example.com</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">2024-10-13 19:54:57</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">e</tspan><tspan class="bold fg8">692ad7d</tspan>
</tspan><tspan xml:space="preserve" x="10" y="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="122" class="output">│  <tspan class="bold fg10">(empty)</tspan><tspan class="bold"> </tspan><tspan class="bold fg10">(no description set)</tspan>
</tspan><tspan xml:space="preserve" x="10" y="140" class="output"><tspan class="bold fg14">◆</tspan>  <tspan class="bold fg5">or</tspan><tspan class="fg8">rkosyo</tspan> <tspan class="fg3">octocat@nowhere.com</tspan> <tspan class="fg6">2012-03-06 16:06:50</tspan> <tspan class="fg5">master</tspan> <tspan class="bold fg4">7</tspan><tspan class="fg8">fd1a60b</tspan> </tspan><tspan xml:space="preserve" x="10" y="140" class="output"><tspan class="bold fg14">◆</tspan>  <tspan class="bold fg5">o</tspan><tspan class="fg8">rrkosyo</tspan> <tspan class="fg3">octocat@nowhere.com</tspan> <tspan class="fg6">2012-03-06 16:06:50</tspan> <tspan class="fg5">master</tspan> <tspan class="bold fg4">7</tspan><tspan class="fg8">fd1a60b</tspan>
</tspan><tspan xml:space="preserve" x="10" y="158" class="output">│  <tspan class="fg2">(empty)</tspan> Merge pull request #6 from Spaceghost/patch-1 </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="176" class="output">~
</tspan><tspan xml:space="preserve" x="10" y="194" class="output"> </tspan><tspan xml:space="preserve" x="10" y="194" class="output">
@ -50,8 +50,8 @@
</tspan><tspan xml:space="preserve" x="10" y="230" class="output"><tspan class="fg2"># when we rebase it:</tspan> </tspan><tspan xml:space="preserve" x="10" y="230" class="output"><tspan class="fg2"># when we rebase it:</tspan>
</tspan><tspan xml:space="preserve" x="10" y="248" class="output"> </tspan><tspan xml:space="preserve" x="10" y="248" class="output">
</tspan><tspan xml:space="preserve" x="10" y="266" class="output">$ jj describe -m "README: say which world" </tspan><tspan xml:space="preserve" x="10" y="266" class="output">$ jj describe -m "README: say which world"
</tspan><tspan xml:space="preserve" x="10" y="284" class="output">Working copy now at: <tspan class="bold fg13">ox</tspan><tspan class="bold fg8">mwolvs</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">b</tspan><tspan class="bold fg8">4f72dbc</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="284" class="output">Working copy now at: <tspan class="bold fg13">t</tspan><tspan class="bold fg8">mnxzsns</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">c</tspan><tspan class="bold fg8">57f52b0</tspan><tspan class="bold"> </tspan><tspan class="bold fg10">(empty)</tspan><tspan class="bold"> README: say which world</tspan>
</tspan><tspan xml:space="preserve" x="10" y="302" class="output">Parent commit      : <tspan class="bold fg5">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="302" class="output">Parent commit      : <tspan class="bold fg5">o</tspan><tspan class="fg8">rrkosyo</tspan> <tspan class="bold fg4">7</tspan><tspan class="fg8">fd1a60b</tspan> <tspan class="fg5">master</tspan><tspan class="fg8"> | </tspan><tspan class="fg2">(empty)</tspan> Merge pull request #6 fr<tspan class="hard-br" rotate="45" dx=".1em" dy="-.2em">↓</tspan>
</tspan><tspan xml:space="preserve" x="10" y="320" class="output">om Spaceghost/patch-1 </tspan><tspan xml:space="preserve" x="10" y="320" class="output">om Spaceghost/patch-1
</tspan><tspan xml:space="preserve" x="10" y="338" class="output">$ echo "Hello Earth!" &gt; README </tspan><tspan xml:space="preserve" x="10" y="338" class="output">$ echo "Hello Earth!" &gt; README
</tspan><tspan xml:space="preserve" x="10" y="356" class="output">$ jj diff </tspan><tspan xml:space="preserve" x="10" y="356" class="output">$ jj diff
@ -69,30 +69,30 @@
</tspan><tspan xml:space="preserve" x="10" y="572" class="output"> </tspan><tspan xml:space="preserve" x="10" y="572" class="output">
</tspan><tspan xml:space="preserve" x="10" y="590" class="output">$ jj rebase -d b1 </tspan><tspan xml:space="preserve" x="10" y="590" class="output">$ jj rebase -d b1
</tspan><tspan xml:space="preserve" x="10" y="608" class="output">Rebased 1 commits </tspan><tspan xml:space="preserve" x="10" y="608" class="output">Rebased 1 commits
</tspan><tspan xml:space="preserve" x="10" y="626" class="output">New conflicts appeared in these commits: </tspan><tspan xml:space="preserve" x="10" y="626" class="output">Working copy now at: <tspan class="bold fg13">tm</tspan><tspan class="bold fg8">nxzsns</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">0</tspan><tspan class="bold fg8">23f3c51</tspan><tspan class="bold"> </tspan><tspan class="bold fg9">(conflict)</tspan><tspan class="bold"> README: say which world</tspan>
</tspan><tspan xml:space="preserve" x="10" y="644" class="output">  <tspan class="bold fg5">ox</tspan><tspan class="fg8">mwolvs</tspan> <tspan class="bold fg4">d</tspan><tspan class="fg8">8d13eb1</tspan> <tspan class="fg1">(conflict)</tspan> README: say which world </tspan><tspan xml:space="preserve" x="10" y="644" class="output">Parent commit      : <tspan class="bold fg5">tp</tspan><tspan class="fg8">stlust</tspan> <tspan class="bold fg4">b</tspan><tspan class="fg8">1b3f972</tspan> <tspan class="fg5">octocat-patch-1@origin</tspan><tspan class="fg8"> | </tspan>sentence case
</tspan><tspan xml:space="preserve" x="10" y="662" class="output">To resolve the conflicts, start by updating to it: </tspan><tspan xml:space="preserve" x="10" y="662" class="output">Added 0 files, modified 1 files, removed 0 files
</tspan><tspan xml:space="preserve" x="10" y="680" class="output">  jj new oxmwolvsqlku </tspan><tspan xml:space="preserve" x="10" y="680" class="output">There are unresolved conflicts at these paths:
</tspan><tspan xml:space="preserve" x="10" y="698" class="output">Then use `jj resolve`, or edit the conflict markers in the file directly. </tspan><tspan xml:space="preserve" x="10" y="698" class="output">README    <tspan class="fg3">2-sided conflict</tspan>
</tspan><tspan xml:space="preserve" x="10" y="716" class="output">Once the conflicts are resolved, you may want to inspect the result with `jj dif<tspan class="hard-br" rotate="45" dx=".1em" dy="-.2em">↓</tspan> </tspan><tspan xml:space="preserve" x="10" y="716" class="output">New conflicts appeared in these commits:
</tspan><tspan xml:space="preserve" x="10" y="734" class="output">f`. </tspan><tspan xml:space="preserve" x="10" y="734" class="output">  <tspan class="bold fg5">tm</tspan><tspan class="fg8">nxzsns</tspan> <tspan class="bold fg4">0</tspan><tspan class="fg8">23f3c51</tspan> <tspan class="fg1">(conflict)</tspan> README: say which world
</tspan><tspan xml:space="preserve" x="10" y="752" class="output">Then run `jj squash` to move the resolution into the conflicted commit. </tspan><tspan xml:space="preserve" x="10" y="752" class="output">To resolve the conflicts, start by updating to it:
</tspan><tspan xml:space="preserve" x="10" y="770" class="output">Working copy now at: <tspan class="bold fg13">ox</tspan><tspan class="bold fg8">mwolvs</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">d</tspan><tspan class="bold fg8">8d13eb1</tspan><tspan class="bold"> </tspan><tspan class="bold fg9">(conflict)</tspan><tspan class="bold"> README: say which world</tspan> </tspan><tspan xml:space="preserve" x="10" y="770" class="output">  jj new <tspan class="bold fg5">tm</tspan><tspan class="fg8">nxzsns</tspan>
</tspan><tspan xml:space="preserve" x="10" y="788" class="output">Parent commit      : <tspan class="bold fg5">t</tspan><tspan class="fg8">pstlust</tspan> <tspan class="bold fg4">b</tspan><tspan class="fg8">1b3f972</tspan> <tspan class="fg5">octocat-patch-1@origin</tspan><tspan class="fg8"> | </tspan>sentence case </tspan><tspan xml:space="preserve" x="10" y="788" class="output">Then use `jj resolve`, or edit the conflict markers in the file directly.
</tspan><tspan xml:space="preserve" x="10" y="806" class="output">Added 0 files, modified 1 files, removed 0 files </tspan><tspan xml:space="preserve" x="10" y="806" class="output">Once the conflicts are resolved, you may want to inspect the result with `jj dif<tspan class="hard-br" rotate="45" dx=".1em" dy="-.2em">↓</tspan>
</tspan><tspan xml:space="preserve" x="10" y="824" class="output">There are unresolved conflicts at these paths: </tspan><tspan xml:space="preserve" x="10" y="824" class="output">f`.
</tspan><tspan xml:space="preserve" x="10" y="842" class="output">README    <tspan class="fg3">2-sided conflict</tspan> </tspan><tspan xml:space="preserve" x="10" y="842" class="output">Then run `jj squash` to move the resolution into the conflicted commit.
</tspan><tspan xml:space="preserve" x="10" y="860" class="output"> </tspan><tspan xml:space="preserve" x="10" y="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="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="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="914" class="output">
</tspan><tspan xml:space="preserve" x="10" y="932" class="output">$ jj log </tspan><tspan xml:space="preserve" x="10" y="932" class="output">$ jj log
</tspan><tspan xml:space="preserve" x="10" y="950" class="output"><tspan class="bold fg9">@</tspan>  <tspan class="bold fg13">ox</tspan><tspan class="bold fg8">mwolvs</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@example.com</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">2024-09-04 19:21:12</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">d</tspan><tspan class="bold fg8">8d13eb1</tspan><tspan class="bold"> </tspan><tspan class="bold fg9">conflict</tspan> </tspan><tspan xml:space="preserve" x="10" y="950" class="output"><tspan class="bold fg9">@</tspan>  <tspan class="bold fg13">tm</tspan><tspan class="bold fg8">nxzsns</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@example.com</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">2024-10-13 19:54:57</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">0</tspan><tspan class="bold fg8">23f3c51</tspan><tspan class="bold"> </tspan><tspan class="bold fg9">conflict</tspan>
</tspan><tspan xml:space="preserve" x="10" y="968" class="output">│  <tspan class="bold">README: say which world</tspan> </tspan><tspan xml:space="preserve" x="10" y="968" class="output">│  <tspan class="bold">README: say which world</tspan>
</tspan><tspan xml:space="preserve" x="10" y="986" class="output"><tspan class="bold fg14">◆</tspan>  <tspan class="bold fg5">t</tspan><tspan class="fg8">pstlust</tspan> <tspan class="fg3">support+octocat@github.com</tspan> <tspan class="fg6">2018-05-10 10:55:19</tspan> </tspan><tspan xml:space="preserve" x="10" y="986" class="output"><tspan class="bold fg14">◆</tspan>  <tspan class="bold fg5">tp</tspan><tspan class="fg8">stlust</tspan> <tspan class="fg3">support+octocat@github.com</tspan> <tspan class="fg6">2018-05-10 10:55:19</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1004" class="output">│  <tspan class="fg5">octocat-patch-1@origin</tspan> <tspan class="bold fg4">b</tspan><tspan class="fg8">1b3f972</tspan> </tspan><tspan xml:space="preserve" x="10" y="1004" class="output">│  <tspan class="fg5">octocat-patch-1@origin</tspan> <tspan class="bold fg4">b</tspan><tspan class="fg8">1b3f972</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1022" class="output">│  sentence case </tspan><tspan xml:space="preserve" x="10" y="1022" class="output">│  sentence case
</tspan><tspan xml:space="preserve" x="10" y="1040" class="output"><tspan class="bold fg14">◆</tspan>  <tspan class="bold fg5">or</tspan><tspan class="fg8">rkosyo</tspan> <tspan class="fg3">octocat@nowhere.com</tspan> <tspan class="fg6">2012-03-06 16:06:50</tspan> <tspan class="fg5">master</tspan> <tspan class="bold fg4">7</tspan><tspan class="fg8">fd1a60b</tspan> </tspan><tspan xml:space="preserve" x="10" y="1040" class="output"><tspan class="bold fg14">◆</tspan>  <tspan class="bold fg5">o</tspan><tspan class="fg8">rrkosyo</tspan> <tspan class="fg3">octocat@nowhere.com</tspan> <tspan class="fg6">2012-03-06 16:06:50</tspan> <tspan class="fg5">master</tspan> <tspan class="bold fg4">7</tspan><tspan class="fg8">fd1a60b</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1058" class="output">│  <tspan class="fg2">(empty)</tspan> Merge pull request #6 from Spaceghost/patch-1 </tspan><tspan xml:space="preserve" x="10" y="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="1076" class="output">~
</tspan><tspan xml:space="preserve" x="10" y="1094" class="output">$ jj status </tspan><tspan xml:space="preserve" x="10" y="1094" class="output">$ jj status
@ -100,8 +100,8 @@
</tspan><tspan xml:space="preserve" x="10" y="1130" class="output"><tspan class="fg6">M README</tspan> </tspan><tspan xml:space="preserve" x="10" y="1130" class="output"><tspan class="fg6">M README</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1148" class="output"><tspan class="fg1">There are unresolved conflicts at these paths:</tspan> </tspan><tspan xml:space="preserve" x="10" y="1148" class="output"><tspan class="fg1">There are unresolved conflicts at these paths:</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1166" class="output">README    <tspan class="fg3">2-sided conflict</tspan> </tspan><tspan xml:space="preserve" x="10" y="1166" class="output">README    <tspan class="fg3">2-sided conflict</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1184" class="output">Working copy : <tspan class="bold fg13">ox</tspan><tspan class="bold fg8">mwolvs</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">d</tspan><tspan class="bold fg8">8d13eb1</tspan><tspan class="bold"> </tspan><tspan class="bold fg9">(conflict)</tspan><tspan class="bold"> README: say which world</tspan> </tspan><tspan xml:space="preserve" x="10" y="1184" class="output">Working copy : <tspan class="bold fg13">tm</tspan><tspan class="bold fg8">nxzsns</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">0</tspan><tspan class="bold fg8">23f3c51</tspan><tspan class="bold"> </tspan><tspan class="bold fg9">(conflict)</tspan><tspan class="bold"> README: say which world</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1202" class="output">Parent commit: <tspan class="bold fg5">t</tspan><tspan class="fg8">pstlust</tspan> <tspan class="bold fg4">b</tspan><tspan class="fg8">1b3f972</tspan> <tspan class="fg5">octocat-patch-1@origin</tspan><tspan class="fg8"> | </tspan>sentence case </tspan><tspan xml:space="preserve" x="10" y="1202" class="output">Parent commit: <tspan class="bold fg5">tp</tspan><tspan class="fg8">stlust</tspan> <tspan class="bold fg4">b</tspan><tspan class="fg8">1b3f972</tspan> <tspan class="fg5">octocat-patch-1@origin</tspan><tspan class="fg8"> | </tspan>sentence case
</tspan><tspan xml:space="preserve" x="10" y="1220" class="output"> </tspan><tspan xml:space="preserve" x="10" y="1220" class="output">
</tspan><tspan xml:space="preserve" x="10" y="1238" class="output"><tspan class="fg2"># Indeed, the rebased commit has a conflict. The conflicted file</tspan> </tspan><tspan xml:space="preserve" x="10" y="1238" class="output"><tspan class="fg2"># Indeed, the rebased commit has a conflict. The conflicted file</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1256" class="output"><tspan class="fg2"># in the working copy looks like this:</tspan> </tspan><tspan xml:space="preserve" x="10" y="1256" class="output"><tspan class="fg2"># in the working copy looks like this:</tspan>
@ -124,8 +124,8 @@
</tspan><tspan xml:space="preserve" x="10" y="1562" class="output">$ jj status </tspan><tspan xml:space="preserve" x="10" y="1562" class="output">$ jj status
</tspan><tspan xml:space="preserve" x="10" y="1580" class="output">Working copy changes: </tspan><tspan xml:space="preserve" x="10" y="1580" class="output">Working copy changes:
</tspan><tspan xml:space="preserve" x="10" y="1598" class="output"><tspan class="fg6">M README</tspan> </tspan><tspan xml:space="preserve" x="10" y="1598" class="output"><tspan class="fg6">M README</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1616" class="output">Working copy : <tspan class="bold fg13">ox</tspan><tspan class="bold fg8">mwolvs</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">5</tspan><tspan class="bold fg8">a5b8f48</tspan><tspan class="bold"> README: say which world</tspan> </tspan><tspan xml:space="preserve" x="10" y="1616" class="output">Working copy : <tspan class="bold fg13">tm</tspan><tspan class="bold fg8">nxzsns</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">3</tspan><tspan class="bold fg8">da30911</tspan><tspan class="bold"> README: say which world</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1634" class="output">Parent commit: <tspan class="bold fg5">t</tspan><tspan class="fg8">pstlust</tspan> <tspan class="bold fg4">b</tspan><tspan class="fg8">1b3f972</tspan> <tspan class="fg5">octocat-patch-1@origin</tspan><tspan class="fg8"> | </tspan>sentence case </tspan><tspan xml:space="preserve" x="10" y="1634" class="output">Parent commit: <tspan class="bold fg5">tp</tspan><tspan class="fg8">stlust</tspan> <tspan class="bold fg4">b</tspan><tspan class="fg8">1b3f972</tspan> <tspan class="fg5">octocat-patch-1@origin</tspan><tspan class="fg8"> | </tspan>sentence case
</tspan></text> </tspan></text>
</svg> </svg>
</svg> </svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 15 KiB

BIN
demos/working_copy.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 293 KiB

After

Width:  |  Height:  |  Size: 84 KiB

46
demos/working_copy.svg
View File

@ -40,15 +40,15 @@
</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="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="68" class="output">
</tspan><tspan xml:space="preserve" x="10" y="86" class="output">$ jj log </tspan><tspan xml:space="preserve" x="10" y="86" class="output">$ jj log
</tspan><tspan xml:space="preserve" x="10" y="104" class="output"><tspan class="bold fg2">@</tspan>  <tspan class="bold fg13">oz</tspan><tspan class="bold fg8">smopnz</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@example.com</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">2024-09-05 17:44:52</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">f</tspan><tspan class="bold fg8">b3dbcd1</tspan> </tspan><tspan xml:space="preserve" x="10" y="104" class="output"><tspan class="bold fg2">@</tspan>  <tspan class="bold fg13">s</tspan><tspan class="bold fg8">qmuzyqk</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@example.com</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">2024-10-13 19:54:59</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">2</tspan><tspan class="bold fg8">c379c44</tspan>
</tspan><tspan xml:space="preserve" x="10" y="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="122" class="output">│  <tspan class="bold fg10">(empty)</tspan><tspan class="bold"> </tspan><tspan class="bold fg10">(no description set)</tspan>
</tspan><tspan xml:space="preserve" x="10" y="140" class="output"><tspan class="bold fg14">◆</tspan>  <tspan class="bold fg5">or</tspan><tspan class="fg8">rkosyo</tspan> <tspan class="fg3">octocat@nowhere.com</tspan> <tspan class="fg6">2012-03-06 16:06:50</tspan> <tspan class="fg5">master</tspan> <tspan class="bold fg4">7</tspan><tspan class="fg8">fd1a60b</tspan> </tspan><tspan xml:space="preserve" x="10" y="140" class="output"><tspan class="bold fg14">◆</tspan>  <tspan class="bold fg5">o</tspan><tspan class="fg8">rrkosyo</tspan> <tspan class="fg3">octocat@nowhere.com</tspan> <tspan class="fg6">2012-03-06 16:06:50</tspan> <tspan class="fg5">master</tspan> <tspan class="bold fg4">7</tspan><tspan class="fg8">fd1a60b</tspan>
</tspan><tspan xml:space="preserve" x="10" y="158" class="output">│  <tspan class="fg2">(empty)</tspan> Merge pull request #6 from Spaceghost/patch-1 </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="176" class="output">~
</tspan><tspan xml:space="preserve" x="10" y="194" class="output">$ jj status </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="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">oz</tspan><tspan class="bold fg8">smopnz</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">f</tspan><tspan class="bold fg8">b3dbcd1</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="230" class="output">Working copy : <tspan class="bold fg13">s</tspan><tspan class="bold fg8">qmuzyqk</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">2</tspan><tspan class="bold fg8">c379c44</tspan><tspan class="bold"> </tspan><tspan class="bold fg10">(empty)</tspan><tspan class="bold"> </tspan><tspan class="bold fg10">(no description set)</tspan>
</tspan><tspan xml:space="preserve" x="10" y="248" class="output">Parent commit: <tspan class="bold fg5">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 from Spa<tspan class="hard-br" rotate="45" dx=".1em" dy="-.2em">↓</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="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="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="302" class="output"><tspan class="fg2"># Now make some changes in the working copy:</tspan>
@ -63,27 +63,27 @@
</tspan><tspan xml:space="preserve" x="10" y="464" class="output">Working copy changes: </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="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="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">oz</tspan><tspan class="bold fg8">smopnz</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">e</tspan><tspan class="bold fg8">667643c</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">(no description set)</tspan> </tspan><tspan xml:space="preserve" x="10" y="518" class="output">Working copy : <tspan class="bold fg13">s</tspan><tspan class="bold fg8">qmuzyqk</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">8</tspan><tspan class="bold fg8">a6d28e6</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">(no description set)</tspan>
</tspan><tspan xml:space="preserve" x="10" y="536" class="output">Parent commit: <tspan class="bold fg5">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 from Spa<tspan class="hard-br" rotate="45" dx=".1em" dy="-.2em">↓</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="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="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="590" class="output"><tspan class="fg2"># Add a bookmark so we can easily refer to this</tspan>
</tspan><tspan xml:space="preserve" x="10" y="608" class="output"><tspan class="fg2"># commit:</tspan> </tspan><tspan xml:space="preserve" x="10" y="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="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="644" class="output">$ jj bookmark create goodbye
</tspan><tspan xml:space="preserve" x="10" y="662" class="output">Created 1 branches pointing to <tspan class="bold fg5">oz</tspan><tspan class="fg8">smopnz</tspan> <tspan class="bold fg4">e</tspan><tspan class="fg8">667643c</tspan> <tspan class="fg5">goodbye</tspan><tspan class="fg8"> | </tspan><tspan class="fg3">(no description set)</tspan> </tspan><tspan xml:space="preserve" x="10" y="662" class="output">Created 1 bookmarks pointing to <tspan class="bold fg5">s</tspan><tspan class="fg8">qmuzyqk</tspan> <tspan class="bold fg4">8</tspan><tspan class="fg8">a6d28e6</tspan> <tspan class="fg5">goodbye</tspan><tspan class="fg8"> | </tspan><tspan class="fg3">(no description set)</tspan>
</tspan><tspan xml:space="preserve" x="10" y="680" class="output">$ jj log </tspan><tspan xml:space="preserve" x="10" y="680" class="output">$ jj log
</tspan><tspan xml:space="preserve" x="10" y="698" class="output"><tspan class="bold fg2">@</tspan>  <tspan class="bold fg13">oz</tspan><tspan class="bold fg8">smopnz</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@example.com</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">2024-09-05 17:44:52</tspan><tspan class="bold"> </tspan><tspan class="bold fg13">goodbye</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">e</tspan><tspan class="bold fg8">667643c</tspan> </tspan><tspan xml:space="preserve" x="10" y="698" class="output"><tspan class="bold fg2">@</tspan>  <tspan class="bold fg13">s</tspan><tspan class="bold fg8">qmuzyqk</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@example.com</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">2024-10-13 19:54:59</tspan><tspan class="bold"> </tspan><tspan class="bold fg13">goodbye</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">8</tspan><tspan class="bold fg8">a6d28e6</tspan>
</tspan><tspan xml:space="preserve" x="10" y="716" class="output">│  <tspan class="bold fg3">(no description set)</tspan> </tspan><tspan xml:space="preserve" x="10" y="716" class="output">│  <tspan class="bold fg3">(no description set)</tspan>
</tspan><tspan xml:space="preserve" x="10" y="734" class="output"><tspan class="bold fg14">◆</tspan>  <tspan class="bold fg5">or</tspan><tspan class="fg8">rkosyo</tspan> <tspan class="fg3">octocat@nowhere.com</tspan> <tspan class="fg6">2012-03-06 16:06:50</tspan> <tspan class="fg5">master</tspan> <tspan class="bold fg4">7</tspan><tspan class="fg8">fd1a60b</tspan> </tspan><tspan xml:space="preserve" x="10" y="734" class="output"><tspan class="bold fg14">◆</tspan>  <tspan class="bold fg5">o</tspan><tspan class="fg8">rrkosyo</tspan> <tspan class="fg3">octocat@nowhere.com</tspan> <tspan class="fg6">2012-03-06 16:06:50</tspan> <tspan class="fg5">master</tspan> <tspan class="bold fg4">7</tspan><tspan class="fg8">fd1a60b</tspan>
</tspan><tspan xml:space="preserve" x="10" y="752" 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 class="fg2">(empty)</tspan> Merge pull request #6 from Spaceghost/patch-1
</tspan><tspan xml:space="preserve" x="10" y="770" class="output">~ </tspan><tspan xml:space="preserve" x="10" y="770" class="output">~
</tspan><tspan xml:space="preserve" x="10" y="788" class="output"> </tspan><tspan xml:space="preserve" x="10" y="788" class="output">
</tspan><tspan xml:space="preserve" x="10" y="806" class="output"><tspan class="fg2"># Start working on a new change off of master:</tspan> </tspan><tspan xml:space="preserve" x="10" y="806" class="output"><tspan class="fg2"># Start working on a new change off of master:</tspan>
</tspan><tspan xml:space="preserve" x="10" y="824" class="output"> </tspan><tspan xml:space="preserve" x="10" y="824" class="output">
</tspan><tspan xml:space="preserve" x="10" y="842" class="output">$ jj new master </tspan><tspan xml:space="preserve" x="10" y="842" class="output">$ jj new master
</tspan><tspan xml:space="preserve" x="10" y="860" class="output">Working copy now at: <tspan class="bold fg13">q</tspan><tspan class="bold fg8">ulnmsro</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">c</tspan><tspan class="bold fg8">ece88b0</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">Working copy now at: <tspan class="bold fg13">l</tspan><tspan class="bold fg8">nmmqryq</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">4</tspan><tspan class="bold fg8">a26dc6e</tspan><tspan class="bold"> </tspan><tspan class="bold fg10">(empty)</tspan><tspan class="bold"> </tspan><tspan class="bold fg10">(no description set)</tspan>
</tspan><tspan xml:space="preserve" x="10" y="878" class="output">Parent commit      : <tspan class="bold fg5">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="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="896" class="output">om Spaceghost/patch-1
</tspan><tspan xml:space="preserve" x="10" y="914" class="output">Added 0 files, modified 1 files, removed 1 files </tspan><tspan xml:space="preserve" x="10" y="914" class="output">Added 0 files, modified 1 files, removed 1 files
</tspan><tspan xml:space="preserve" x="10" y="932" class="output"> </tspan><tspan xml:space="preserve" x="10" y="932" class="output">
@ -91,11 +91,11 @@
</tspan><tspan xml:space="preserve" x="10" y="968" class="output"><tspan class="fg2"># "goodbye" change stayed in its own commit:</tspan> </tspan><tspan xml:space="preserve" x="10" y="968" class="output"><tspan class="fg2"># "goodbye" change stayed in its own commit:</tspan>
</tspan><tspan xml:space="preserve" x="10" y="986" class="output"> </tspan><tspan xml:space="preserve" x="10" y="986" class="output">
</tspan><tspan xml:space="preserve" x="10" y="1004" class="output">$ jj log </tspan><tspan xml:space="preserve" x="10" y="1004" class="output">$ jj log
</tspan><tspan xml:space="preserve" x="10" y="1022" class="output"><tspan class="bold fg2">@</tspan>  <tspan class="bold fg13">q</tspan><tspan class="bold fg8">ulnmsro</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@example.com</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">2024-09-05 17:44:51</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">c</tspan><tspan class="bold fg8">ece88b0</tspan> </tspan><tspan xml:space="preserve" x="10" y="1022" class="output"><tspan class="bold fg2">@</tspan>  <tspan class="bold fg13">l</tspan><tspan class="bold fg8">nmmqryq</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@example.com</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">2024-10-13 19:54:58</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">4</tspan><tspan class="bold fg8">a26dc6e</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1040" class="output">│  <tspan class="bold fg10">(empty)</tspan><tspan class="bold"> </tspan><tspan class="bold fg10">(no description set)</tspan> </tspan><tspan xml:space="preserve" x="10" y="1040" class="output">│  <tspan class="bold fg10">(empty)</tspan><tspan class="bold"> </tspan><tspan class="bold fg10">(no description set)</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1058" class="output">│ ○  <tspan class="bold fg5">oz</tspan><tspan class="fg8">smopnz</tspan> <tspan class="fg3">jjfan@example.com</tspan> <tspan class="fg6">2024-09-05 17:44:52</tspan> <tspan class="fg5">goodbye</tspan> <tspan class="bold fg4">e</tspan><tspan class="fg8">667643c</tspan> </tspan><tspan xml:space="preserve" x="10" y="1058" class="output">│ ○  <tspan class="bold fg5">s</tspan><tspan class="fg8">qmuzyqk</tspan> <tspan class="fg3">jjfan@example.com</tspan> <tspan class="fg6">2024-10-13 19:54:59</tspan> <tspan class="fg5">goodbye</tspan> <tspan class="bold fg4">8</tspan><tspan class="fg8">a6d28e6</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1076" class="output">├─╯  <tspan class="fg3">(no description set)</tspan> </tspan><tspan xml:space="preserve" x="10" y="1076" class="output">├─╯  <tspan class="fg3">(no description set)</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1094" class="output"><tspan class="bold fg14">◆</tspan>  <tspan class="bold fg5">or</tspan><tspan class="fg8">rkosyo</tspan> <tspan class="fg3">octocat@nowhere.com</tspan> <tspan class="fg6">2012-03-06 16:06:50</tspan> <tspan class="fg5">master</tspan> <tspan class="bold fg4">7</tspan><tspan class="fg8">fd1a60b</tspan> </tspan><tspan xml:space="preserve" x="10" y="1094" class="output"><tspan class="bold fg14">◆</tspan>  <tspan class="bold fg5">o</tspan><tspan class="fg8">rrkosyo</tspan> <tspan class="fg3">octocat@nowhere.com</tspan> <tspan class="fg6">2012-03-06 16:06:50</tspan> <tspan class="fg5">master</tspan> <tspan class="bold fg4">7</tspan><tspan class="fg8">fd1a60b</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1112" 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="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="1130" class="output">~
</tspan><tspan xml:space="preserve" x="10" y="1148" class="output"> </tspan><tspan xml:space="preserve" x="10" y="1148" class="output">
@ -104,8 +104,8 @@
</tspan><tspan xml:space="preserve" x="10" y="1202" class="output"> </tspan><tspan xml:space="preserve" x="10" y="1202" class="output">
</tspan><tspan xml:space="preserve" x="10" y="1220" class="output">$ jj status </tspan><tspan xml:space="preserve" x="10" y="1220" class="output">$ jj status
</tspan><tspan xml:space="preserve" x="10" y="1238" class="output">The working copy is clean </tspan><tspan xml:space="preserve" x="10" y="1238" class="output">The working copy is clean
</tspan><tspan xml:space="preserve" x="10" y="1256" class="output">Working copy : <tspan class="bold fg13">q</tspan><tspan class="bold fg8">ulnmsro</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">c</tspan><tspan class="bold fg8">ece88b0</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">Working copy : <tspan class="bold fg13">l</tspan><tspan class="bold fg8">nmmqryq</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">4</tspan><tspan class="bold fg8">a26dc6e</tspan><tspan class="bold"> </tspan><tspan class="bold fg10">(empty)</tspan><tspan class="bold"> </tspan><tspan class="bold fg10">(no description set)</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1274" class="output">Parent commit: <tspan class="bold fg5">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 from Spa<tspan class="hard-br" rotate="45" dx=".1em" dy="-.2em">↓</tspan> </tspan><tspan xml:space="preserve" x="10" y="1274" class="output">Parent commit: <tspan class="bold fg5">o</tspan><tspan class="fg8">rrkosyo</tspan> <tspan class="bold fg4">7</tspan><tspan class="fg8">fd1a60b</tspan> <tspan class="fg5">master</tspan><tspan class="fg8"> | </tspan><tspan class="fg2">(empty)</tspan> Merge pull request #6 from Spa<tspan class="hard-br" rotate="45" dx=".1em" dy="-.2em">↓</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1292" class="output">ceghost/patch-1 </tspan><tspan xml:space="preserve" x="10" y="1292" class="output">ceghost/patch-1
</tspan><tspan xml:space="preserve" x="10" y="1310" class="output"> </tspan><tspan xml:space="preserve" x="10" y="1310" class="output">
</tspan><tspan xml:space="preserve" x="10" y="1328" class="output"><tspan class="fg2"># Modify a file in this new change:</tspan> </tspan><tspan xml:space="preserve" x="10" y="1328" class="output"><tspan class="fg2"># Modify a file in this new change:</tspan>
@ -114,8 +114,8 @@
</tspan><tspan xml:space="preserve" x="10" y="1382" class="output">$ jj status </tspan><tspan xml:space="preserve" x="10" y="1382" class="output">$ jj status
</tspan><tspan xml:space="preserve" x="10" y="1400" class="output">Working copy changes: </tspan><tspan xml:space="preserve" x="10" y="1400" class="output">Working copy changes:
</tspan><tspan xml:space="preserve" x="10" y="1418" class="output"><tspan class="fg6">M README</tspan> </tspan><tspan xml:space="preserve" x="10" y="1418" class="output"><tspan class="fg6">M README</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1436" class="output">Working copy : <tspan class="bold fg13">q</tspan><tspan class="bold fg8">ulnmsro</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">5</tspan><tspan class="bold fg8">1e8e98e</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">(no description set)</tspan> </tspan><tspan xml:space="preserve" x="10" y="1436" class="output">Working copy : <tspan class="bold fg13">l</tspan><tspan class="bold fg8">nmmqryq</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">d</tspan><tspan class="bold fg8">edb65bd</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">(no description set)</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1454" class="output">Parent commit: <tspan class="bold fg5">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 from Spa<tspan class="hard-br" rotate="45" dx=".1em" dy="-.2em">↓</tspan> </tspan><tspan xml:space="preserve" x="10" y="1454" class="output">Parent commit: <tspan class="bold fg5">o</tspan><tspan class="fg8">rrkosyo</tspan> <tspan class="bold fg4">7</tspan><tspan class="fg8">fd1a60b</tspan> <tspan class="fg5">master</tspan><tspan class="fg8"> | </tspan><tspan class="fg2">(empty)</tspan> Merge pull request #6 from Spa<tspan class="hard-br" rotate="45" dx=".1em" dy="-.2em">↓</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1472" class="output">ceghost/patch-1 </tspan><tspan xml:space="preserve" x="10" y="1472" class="output">ceghost/patch-1
</tspan><tspan xml:space="preserve" x="10" y="1490" class="output"> </tspan><tspan xml:space="preserve" x="10" y="1490" class="output">
</tspan><tspan xml:space="preserve" x="10" y="1508" class="output"><tspan class="fg2"># The working copy is not special; we can, for</tspan> </tspan><tspan xml:space="preserve" x="10" y="1508" class="output"><tspan class="fg2"># The working copy is not special; we can, for</tspan>
@ -132,11 +132,11 @@
</tspan><tspan xml:space="preserve" x="10" y="1706" class="output"><tspan class="fg2"># Inspect the result:</tspan> </tspan><tspan xml:space="preserve" x="10" y="1706" class="output"><tspan class="fg2"># Inspect the result:</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1724" class="output"> </tspan><tspan xml:space="preserve" x="10" y="1724" class="output">
</tspan><tspan xml:space="preserve" x="10" y="1742" class="output">$ jj log </tspan><tspan xml:space="preserve" x="10" y="1742" class="output">$ jj log
</tspan><tspan xml:space="preserve" x="10" y="1760" class="output">○  <tspan class="bold fg5">oz</tspan><tspan class="fg8">smopnz</tspan> <tspan class="fg3">jjfan@example.com</tspan> <tspan class="fg6">2024-09-05 17:44:52</tspan> <tspan class="fg5">goodbye</tspan> <tspan class="bold fg4">e</tspan><tspan class="fg8">b4cc65d</tspan> </tspan><tspan xml:space="preserve" x="10" y="1760" class="output">○  <tspan class="bold fg5">s</tspan><tspan class="fg8">qmuzyqk</tspan> <tspan class="fg3">jjfan@example.com</tspan> <tspan class="fg6">2024-10-13 19:54:59</tspan> <tspan class="fg5">goodbye</tspan> <tspan class="bold fg4">e</tspan><tspan class="fg8">3842b58</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1778" class="output">│  goodbye </tspan><tspan xml:space="preserve" x="10" y="1778" class="output">│  goodbye
</tspan><tspan xml:space="preserve" x="10" y="1796" class="output">│ <tspan class="bold fg2">@</tspan>  <tspan class="bold fg13">q</tspan><tspan class="bold fg8">ulnmsro</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@example.com</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">2024-09-05 17:44:52</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">a</tspan><tspan class="bold fg8">a8ad947</tspan> </tspan><tspan xml:space="preserve" x="10" y="1796" class="output">│ <tspan class="bold fg2">@</tspan>  <tspan class="bold fg13">l</tspan><tspan class="bold fg8">nmmqryq</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@example.com</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">2024-10-13 19:54:59</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">d</tspan><tspan class="bold fg8">7fadb8a</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1814" class="output">├─╯  <tspan class="bold">everyone</tspan> </tspan><tspan xml:space="preserve" x="10" y="1814" class="output">├─╯  <tspan class="bold">everyone</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1832" class="output"><tspan class="bold fg14">◆</tspan>  <tspan class="bold fg5">or</tspan><tspan class="fg8">rkosyo</tspan> <tspan class="fg3">octocat@nowhere.com</tspan> <tspan class="fg6">2012-03-06 16:06:50</tspan> <tspan class="fg5">master</tspan> <tspan class="bold fg4">7</tspan><tspan class="fg8">fd1a60b</tspan> </tspan><tspan xml:space="preserve" x="10" y="1832" class="output"><tspan class="bold fg14">◆</tspan>  <tspan class="bold fg5">o</tspan><tspan class="fg8">rrkosyo</tspan> <tspan class="fg3">octocat@nowhere.com</tspan> <tspan class="fg6">2012-03-06 16:06:50</tspan> <tspan class="fg5">master</tspan> <tspan class="bold fg4">7</tspan><tspan class="fg8">fd1a60b</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1850" 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 class="fg2">(empty)</tspan> Merge pull request #6 from Spaceghost/patch-1
</tspan><tspan xml:space="preserve" x="10" y="1868" class="output">~ </tspan><tspan xml:space="preserve" x="10" y="1868" class="output">~
</tspan></text> </tspan></text>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 19 KiB

After

Width:  |  Height:  |  Size: 19 KiB