mirror of
https://github.com/martinvonz/jj.git
synced 2024-07-14 08:50:29 +03:00
demos: rearrange and reword portions of demos
This is mainly to account for the fact that most commands now report more information about the state of the repo.
This commit is contained in:
Ilya Grigoriev
parent
0d8c5e12f8
commit
a70ea9dfdc
@ -10,6 +10,7 @@ run_command "cd Hello-World"
|
||||
|
||||
comment "Inspect it:"
|
||||
run_command "jj log -r 'all()'"
|
||||
blank
|
||||
run_command "jj diff -r b1"
|
||||
|
||||
comment "The repo is backed by the actual Git repo:"
|
||||
|
||||
@ -28,13 +28,11 @@ comment "Let's reorder the second and third commits:"
|
||||
run_command "jj rebase -s third -d first"
|
||||
run_command "jj rebase -s second -d third"
|
||||
run_command "jj log"
|
||||
comment "The commit labeled \"third\" has a conflict,
|
||||
as expected. What's more interesting is
|
||||
that the top commit has no conflict! That's
|
||||
because it has the changes from all three
|
||||
commits applied to it."
|
||||
comment "The commit labeled \"third\" has a conflict, as expected. What's more
|
||||
interesting is that the top commit has no conflict! That's because it
|
||||
has the changes from all three commits applied to it.
|
||||
|
||||
comment "Let's verify that by looking at its contents:"
|
||||
Let's verify that by looking at its contents:"
|
||||
run_command "jj co second"
|
||||
run_command "cat file"
|
||||
|
||||
|
||||
@ -27,7 +27,7 @@ comment "The repo now looks like this:"
|
||||
run_command "jj log"
|
||||
comment "The most recent portion of the operation log
|
||||
is:"
|
||||
run_command_allow_broken_pipe "jj op log | head"
|
||||
run_command_allow_broken_pipe "jj op log --limit 4"
|
||||
|
||||
comment "Let's undo that rebase operation:"
|
||||
rebase_op=$(jj --color=never op log --no-graph -T 'id.short(5)' --limit 1 --at-op @--)
|
||||
|
||||
@ -16,6 +16,10 @@ run_command "jj describe -m \"README: say which world\""
|
||||
run_command "echo \"Hello Earth!\" > README"
|
||||
run_command "jj diff"
|
||||
|
||||
# TODO(ilyagr): Get the real shortest prefix of the b1b commit using `jj log
|
||||
# --no-graph` and the `.shortest()` template function.
|
||||
#
|
||||
# This could also be done in demo_git_compat.sh, but that might not be worth it.
|
||||
comment "We're going to rebase it onto commit b1.
|
||||
That commit looks like this:"
|
||||
run_command "jj diff -r b1"
|
||||
@ -23,14 +27,13 @@ run_command "jj diff -r b1"
|
||||
comment "Now rebase:"
|
||||
run_command "jj rebase -d b1"
|
||||
|
||||
comment "Huh, that seemed to succeed. Let's take a
|
||||
look at the repo:"
|
||||
comment "That seemed to succeed but we are also told there is now a conflict.
|
||||
Let's take a look at the repo:"
|
||||
run_command "jj log -r 'all()'"
|
||||
run_command "jj status"
|
||||
|
||||
comment "As you can see, the rebased commit has a
|
||||
conflict. The file in the working copy looks
|
||||
like this:"
|
||||
comment "Indeed, the rebased commit has a conflict. The conflicted file
|
||||
in the working copy looks like this:"
|
||||
run_command "cat README"
|
||||
|
||||
comment "Now we will resolve the conflict:"
|
||||
|
||||
@ -8,17 +8,16 @@ cd Hello-World
|
||||
|
||||
comment "We are in the octocat/Hello-World repo.
|
||||
We have an empty working copy on top of master:"
|
||||
run_command "jj status"
|
||||
run_command "jj log"
|
||||
run_command "jj status"
|
||||
|
||||
comment "Now make some changes in the working copy:"
|
||||
run_command "echo \"Goodbye World!\" > README"
|
||||
run_command "echo stuff > new-file"
|
||||
|
||||
comment "Our working copy's commit ID changed
|
||||
because we made changes:"
|
||||
comment "Because of these changes, our working copy is no longer marked as \"(empty)\".
|
||||
Also, its commit ID (starting with a blue character) changed:"
|
||||
run_command "jj status"
|
||||
run_command "jj log"
|
||||
|
||||
comment "Add a branch so we can easily refer to this
|
||||
commit:"
|
||||
@ -27,24 +26,27 @@ run_command "jj log"
|
||||
|
||||
comment "Start working on a new change off of master:"
|
||||
run_command "jj co master"
|
||||
run_command "jj log"
|
||||
|
||||
comment "Note that the working copy is now clean; the
|
||||
comment "Note that we were told the working copy is now empty (AKA clean). The
|
||||
\"goodbye\" change stayed in its own commit:"
|
||||
|
||||
run_command "jj log"
|
||||
comment "Let's do a sanity check: 'jj status' should tell us that
|
||||
the working copy is clean."
|
||||
run_command "jj status"
|
||||
|
||||
comment "Modify a file in this new change:"
|
||||
run_command "echo \"Hello everyone!\" > README"
|
||||
run_command "jj status"
|
||||
|
||||
comment "The working copy is not special; we can, for
|
||||
example, set the description of any commit.
|
||||
First, set it on the working copy:"
|
||||
run_command "jj describe -m everyone"
|
||||
# The output with the description of the working copy slightly messes up the
|
||||
# parallel between the working copy and another commit, so we redact it.
|
||||
run_command_output_redacted "jj describe -m everyone"
|
||||
|
||||
comment "Now set it on the change we worked on before:"
|
||||
run_command "jj describe goodbye -m goodbye"
|
||||
|
||||
comment "Inspect the result:"
|
||||
run_command "jj log"
|
||||
|
||||
blank
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
<!-- Created with term-transcript v0.3.0 (https://github.com/slowli/term-transcript) -->
|
||||
<svg viewBox="0 0 720 866" width="720" height="866" xmlns="http://www.w3.org/2000/svg">
|
||||
<svg viewBox="0 0 720 884" width="720" height="884" xmlns="http://www.w3.org/2000/svg">
|
||||
<style>
|
||||
.container {
|
||||
font: 14px Fira Code, Liberation Mono, SFMono-Regular, Consolas, Menlo, monospace;
|
||||
@ -33,15 +33,15 @@
|
||||
.fg15 { fill: #f2f2f2; } .output-bg .fg15 { stroke: #f2f2f2; }
|
||||
</style>
|
||||
<rect width="100%" height="100%" y="0" rx="4.5" style="fill: #0c0c0c;" />
|
||||
<svg x="0" y="10" width="720" height="846" viewBox="0 0 720 846">
|
||||
<svg x="0" y="10" width="720" height="864" viewBox="0 0 720 864">
|
||||
<g class="input-bg"></g>
|
||||
<text class="container fg7"><tspan xml:space="preserve" x="10" y="14" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="32" class="output"><tspan class="fg2"># Clone a Git repo:</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="50" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="68" class="output">$ jj git clone https://github.com/octocat/Hello-World
|
||||
</tspan><tspan xml:space="preserve" x="10" y="86" class="output">Fetching into new repo in "/tmp/tmp.PUd3syX7da/Hello-World"
|
||||
</tspan><tspan xml:space="preserve" x="10" y="104" class="output">Working copy now at: <tspan class="bold fg13">p</tspan><tspan class="bold fg8">xlotqpw</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">e</tspan><tspan class="bold fg8">905ce63</tspan><tspan class="bold"> </tspan><tspan class="bold fg10">(empty)</tspan><tspan class="bold"> </tspan><tspan class="bold fg10">(no description set)</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="122" class="output">Parent commit : <tspan class="bold fg5">o</tspan><tspan class="fg8">rrkosyo</tspan> <tspan class="bold fg4">7</tspan><tspan class="fg8">fd1a60b</tspan> <tspan class="fg5">master</tspan><tspan class="fg8"> | </tspan><tspan class="fg2">(empty)</tspan> Merge pull request #6 fr<tspan class="hard-br" rotate="45" dx=".1em" dy="-.2em">↓</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="86" class="output">Fetching into new repo in "/tmp/tmp.8MxGFBZpqj/Hello-World"
|
||||
</tspan><tspan xml:space="preserve" x="10" y="104" class="output">Working copy now at: <tspan class="bold fg13">op</tspan><tspan class="bold fg8">lronuy</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">0</tspan><tspan class="bold fg8">af35f48</tspan><tspan class="bold"> </tspan><tspan class="bold fg10">(empty)</tspan><tspan class="bold"> </tspan><tspan class="bold fg10">(no description set)</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="122" class="output">Parent commit : <tspan class="bold fg5">or</tspan><tspan class="fg8">rkosyo</tspan> <tspan class="bold fg4">7</tspan><tspan class="fg8">fd1a60b</tspan> <tspan class="fg5">master</tspan><tspan class="fg8"> | </tspan><tspan class="fg2">(empty)</tspan> Merge pull request #6 fr<tspan class="hard-br" rotate="45" dx=".1em" dy="-.2em">↓</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="140" class="output">om Spaceghost/patch-1
|
||||
</tspan><tspan xml:space="preserve" x="10" y="158" class="output">Added 1 files, modified 0 files, removed 0 files
|
||||
</tspan><tspan xml:space="preserve" x="10" y="176" class="output">$ cd Hello-World
|
||||
@ -49,39 +49,40 @@
|
||||
</tspan><tspan xml:space="preserve" x="10" y="212" class="output"><tspan class="fg2"># Inspect it:</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="230" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="248" class="output">$ jj log -r 'all()'
|
||||
</tspan><tspan xml:space="preserve" x="10" y="266" class="output">@ <tspan class="bold fg13">p</tspan><tspan class="bold fg8">xlotqpw</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@example.com</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">2023-10-01 22:29:21.000 -07:00</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">e</tspan><tspan class="bold fg8">905ce63</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="266" class="output">@ <tspan class="bold fg13">op</tspan><tspan class="bold fg8">lronuy</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@example.com</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">2023-10-03 17:52:06.000 -07:00</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">0</tspan><tspan class="bold fg8">af35f48</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="284" class="output">│ <tspan class="bold fg10">(empty)</tspan><tspan class="bold"> </tspan><tspan class="bold fg10">(no description set)</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="302" class="output">│ ◉ <tspan class="bold fg5">t</tspan><tspan class="fg8">pstlust</tspan> <tspan class="fg3">support+octocat@github.com</tspan> <tspan class="fg6">2018-05-10 12:55:19.000 -05:00</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="320" class="output">├─╯ <tspan class="fg5">octocat-patch-1</tspan> <tspan class="bold fg4">b1</tspan><tspan class="fg8">b3f972</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="338" class="output">│ sentence case
|
||||
</tspan><tspan xml:space="preserve" x="10" y="356" class="output">│ ◉ <tspan class="bold fg5">k</tspan><tspan class="fg8">owxouwz</tspan> <tspan class="fg3">octocat@nowhere.com</tspan> <tspan class="fg6">2014-06-10 15:22:26.000 -07:00</tspan> <tspan class="fg5">test</tspan> <tspan class="bold fg4">b3</tspan><tspan class="fg8">cbd5bb</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="374" class="output">├─╯ Create CONTRIBUTING.md
|
||||
</tspan><tspan xml:space="preserve" x="10" y="392" class="output">◉ <tspan class="bold fg5">o</tspan><tspan class="fg8">rrkosyo</tspan> <tspan class="fg3">octocat@nowhere.com</tspan> <tspan class="fg6">2012-03-06 15:06:50.000 -08:00</tspan> <tspan class="fg5">master</tspan> <tspan class="bold fg4">7</tspan><tspan class="fg8">fd1a60b</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="392" class="output">◉ <tspan class="bold fg5">or</tspan><tspan class="fg8">rkosyo</tspan> <tspan class="fg3">octocat@nowhere.com</tspan> <tspan class="fg6">2012-03-06 15:06:50.000 -08:00</tspan> <tspan class="fg5">master</tspan> <tspan class="bold fg4">7</tspan><tspan class="fg8">fd1a60b</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="410" class="output">├─╮ <tspan class="fg2">(empty)</tspan> Merge pull request #6 from Spaceghost/patch-1
|
||||
</tspan><tspan xml:space="preserve" x="10" y="428" class="output">│ ◉ <tspan class="bold fg5">n</tspan><tspan class="fg8">znozkvv</tspan> <tspan class="fg3">Johnneylee.rollins@gmail.com</tspan> <tspan class="fg6">2011-09-13 21:42:41.000 -07:00</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="446" class="output">├─╯ <tspan class="bold fg4">76</tspan><tspan class="fg8">294131</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="464" class="output">│ New line at end of file. --Signed off by Spaceghost
|
||||
</tspan><tspan xml:space="preserve" x="10" y="482" class="output">◉ <tspan class="bold fg5">s</tspan><tspan class="fg8">yktoqts</tspan> <tspan class="fg3">cameron@github.com</tspan> <tspan class="fg6">2011-01-26 11:06:08.000 -08:00</tspan> <tspan class="bold fg4">5</tspan><tspan class="fg8">53c2077</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="500" class="output">│ first commit
|
||||
</tspan><tspan xml:space="preserve" x="10" y="518" class="output">◉ <tspan class="bold fg5">z</tspan><tspan class="fg8">zzzzzzz</tspan> <tspan class="fg2">root()</tspan> <tspan class="bold fg4">0</tspan><tspan class="fg8">0000000</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="536" class="output">$ jj diff -r b1
|
||||
</tspan><tspan xml:space="preserve" x="10" y="554" class="output"><tspan class="fg3">Modified regular file README:</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="572" class="output"><tspan class="fg1"> 1</tspan> <tspan class="fg2"> 1</tspan>: Hello <tspan class="fg1">World</tspan><tspan class="fg2">world</tspan>!
|
||||
</tspan><tspan xml:space="preserve" x="10" y="590" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="608" class="output"><tspan class="fg2"># The repo is backed by the actual Git repo:</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="626" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="644" class="output">$ git --git-dir=.jj/repo/store/git log --graph --all --decorate --oneline
|
||||
</tspan><tspan xml:space="preserve" x="10" y="662" class="output">* <tspan class="fg3">e905ce6</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="680" class="output"><tspan class="fg1">|</tspan> * <tspan class="fg3">d7ab898</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="698" 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="716" class="output"><tspan class="fg1">|</tspan><tspan class="fg1">/</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="734" 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="752" class="output"><tspan class="fg1">|</tspan><tspan class="fg1">/</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="770" class="output">* <tspan class="fg3">7fd1a60</tspan><tspan class="fg3"> (</tspan><tspan class="bold fg1">origin/master</tspan><tspan class="fg3">)</tspan> Merge pull request #6 from Spaceghost/patch-1
|
||||
</tspan><tspan xml:space="preserve" x="10" y="788" class="output"><tspan class="fg4">|</tspan><tspan class="fg5">\</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="806" class="output"><tspan class="fg4">|</tspan> * <tspan class="fg3">7629413</tspan> New line at end of file. --Signed off by Spaceghost
|
||||
</tspan><tspan xml:space="preserve" x="10" y="824" class="output"><tspan class="fg4">|</tspan><tspan class="fg4">/</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="842" class="output">* <tspan class="fg3">553c207</tspan> first commit
|
||||
</tspan><tspan xml:space="preserve" x="10" y="518" class="output">◉ <tspan class="bold fg5">z</tspan><tspan class="fg8">zzzzzzz</tspan> <tspan class="fg2">root()</tspan> <tspan class="bold fg4">00</tspan><tspan class="fg8">000000</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="536" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="554" class="output">$ jj diff -r b1
|
||||
</tspan><tspan xml:space="preserve" x="10" y="572" class="output"><tspan class="fg3">Modified regular file README:</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="590" class="output"><tspan class="fg1"> 1</tspan> <tspan class="fg2"> 1</tspan>: Hello <tspan class="fg1">World</tspan><tspan class="fg2">world</tspan>!
|
||||
</tspan><tspan xml:space="preserve" x="10" y="608" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="626" class="output"><tspan class="fg2"># The repo is backed by the actual Git repo:</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="644" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="662" class="output">$ git --git-dir=.jj/repo/store/git log --graph --all --decorate --oneline
|
||||
</tspan><tspan xml:space="preserve" x="10" y="680" class="output">* <tspan class="fg3">b79d37f</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="698" class="output">* <tspan class="fg3">0af35f4</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="716" class="output"><tspan class="fg1">|</tspan> * <tspan class="fg3">b1b3f97</tspan><tspan class="fg3"> (</tspan><tspan class="bold fg1">origin/octocat-patch-1</tspan><tspan class="fg3">)</tspan> sentence case
|
||||
</tspan><tspan xml:space="preserve" x="10" y="734" class="output"><tspan class="fg1">|</tspan><tspan class="fg1">/</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="752" class="output"><tspan class="fg1">|</tspan> * <tspan class="fg3">b3cbd5b</tspan><tspan class="fg3"> (</tspan><tspan class="bold fg1">origin/test</tspan><tspan class="fg3">)</tspan> Create CONTRIBUTING.md
|
||||
</tspan><tspan xml:space="preserve" x="10" y="770" class="output"><tspan class="fg1">|</tspan><tspan class="fg1">/</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="788" class="output">* <tspan class="fg3">7fd1a60</tspan><tspan class="fg3"> (</tspan><tspan class="bold fg1">origin/master</tspan><tspan class="fg3">)</tspan> Merge pull request #6 from Spaceghost/patch-1
|
||||
</tspan><tspan xml:space="preserve" x="10" y="806" class="output"><tspan class="fg4">|</tspan><tspan class="fg5">\</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="824" class="output"><tspan class="fg4">|</tspan> * <tspan class="fg3">7629413</tspan> New line at end of file. --Signed off by Spaceghost
|
||||
</tspan><tspan xml:space="preserve" x="10" y="842" class="output"><tspan class="fg4">|</tspan><tspan class="fg4">/</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="860" class="output">* <tspan class="fg3">553c207</tspan> first commit
|
||||
</tspan></text>
|
||||
</svg>
|
||||
</svg>
|
||||
|
||||
|
Before Width: | Height: | Size: 9.9 KiB After Width: | Height: | Size: 9.9 KiB |
@ -16,6 +16,14 @@ run_command() {
|
||||
COLUMNS=${RUN_COMMAND_COLUMNS-${COLUMNS-80}} eval "$@"
|
||||
}
|
||||
|
||||
run_command_output_redacted() {
|
||||
echo "\$ $@"
|
||||
# `bash` often resets $COLUMNS, so we also
|
||||
# allow $RUN_COMMAND_COLUMNS
|
||||
eval "$@" > /dev/null
|
||||
echo -e "\033[0;90m... (output redacted) ...\033[0m"
|
||||
}
|
||||
|
||||
run_command_allow_broken_pipe() {
|
||||
run_command "$@" || {
|
||||
EXITCODE="$?"
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
<!-- Created with term-transcript v0.3.0 (https://github.com/slowli/term-transcript) -->
|
||||
<svg viewBox="0 0 720 1640" width="720" height="1640" xmlns="http://www.w3.org/2000/svg">
|
||||
<svg viewBox="0 0 720 1586" width="720" height="1586" xmlns="http://www.w3.org/2000/svg">
|
||||
<style>
|
||||
.container {
|
||||
font: 14px Fira Code, Liberation Mono, SFMono-Regular, Consolas, Menlo, monospace;
|
||||
@ -33,20 +33,20 @@
|
||||
.fg15 { fill: #f2f2f2; } .output-bg .fg15 { stroke: #f2f2f2; }
|
||||
</style>
|
||||
<rect width="100%" height="100%" y="0" rx="4.5" style="fill: #0c0c0c;" />
|
||||
<svg x="0" y="10" width="720" height="1620" viewBox="0 0 720 1620">
|
||||
<svg x="0" y="10" width="720" height="1566" viewBox="0 0 720 1566">
|
||||
<g class="input-bg"></g>
|
||||
<text class="container fg7"><tspan xml:space="preserve" x="10" y="14" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="32" class="output"><tspan class="fg2"># We are in a repo with three commits, all</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="86" class="output">$ jj log
|
||||
</tspan><tspan xml:space="preserve" x="10" y="104" class="output">@ <tspan class="bold fg13">u</tspan><tspan class="bold fg8">pqsurwq</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@example.com</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">2023-10-01 22:29:22.258 -07:00</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">5</tspan><tspan class="bold fg8">d13bfb2</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="104" class="output">@ <tspan class="bold fg13">r</tspan><tspan class="bold fg8">trqxtor</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@example.com</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">2023-10-03 17:52:07.433 -07:00</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">d</tspan><tspan class="bold fg8">728789b</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="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">l</tspan><tspan class="fg8">tqxzzvn</tspan> <tspan class="fg3">jjfan@example.com</tspan> <tspan class="fg6">2023-10-01 22:29:22.258 -07:00</tspan> <tspan class="fg5">third</tspan> <tspan class="bold fg4">d</tspan><tspan class="fg8">7689062</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="140" class="output">◉ <tspan class="bold fg5">q</tspan><tspan class="fg8">syokrkk</tspan> <tspan class="fg3">jjfan@example.com</tspan> <tspan class="fg6">2023-10-03 17:52:07.433 -07:00</tspan> <tspan class="fg5">third</tspan> <tspan class="bold fg4">8</tspan><tspan class="fg8">5066d2a</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="158" class="output">│ third
|
||||
</tspan><tspan xml:space="preserve" x="10" y="176" class="output">◉ <tspan class="bold fg5">n</tspan><tspan class="fg8">rlsumvr</tspan> <tspan class="fg3">jjfan@example.com</tspan> <tspan class="fg6">2023-10-01 22:29:22.202 -07:00</tspan> <tspan class="fg5">second</tspan> <tspan class="bold fg4">4</tspan><tspan class="fg8">83c2b23</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="176" class="output">◉ <tspan class="bold fg5">p</tspan><tspan class="fg8">mlzoorv</tspan> <tspan class="fg3">jjfan@example.com</tspan> <tspan class="fg6">2023-10-03 17:52:07.372 -07:00</tspan> <tspan class="fg5">second</tspan> <tspan class="bold fg4">6</tspan><tspan class="fg8">a11efb9</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="194" class="output">│ second
|
||||
</tspan><tspan xml:space="preserve" x="10" y="212" class="output">◉ <tspan class="bold fg5">p</tspan><tspan class="fg8">umwmyut</tspan> <tspan class="fg3">jjfan@example.com</tspan> <tspan class="fg6">2023-10-01 22:29:22.147 -07:00</tspan> <tspan class="fg5">first</tspan> <tspan class="bold fg4">e</tspan><tspan class="fg8">b0ec5cc</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="212" class="output">◉ <tspan class="bold fg5">m</tspan><tspan class="fg8">zssttms</tspan> <tspan class="fg3">jjfan@example.com</tspan> <tspan class="fg6">2023-10-03 17:52:07.312 -07:00</tspan> <tspan class="fg5">first</tspan> <tspan class="bold fg4">c</tspan><tspan class="fg8">2cb2cfa</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="230" class="output">│ first
|
||||
</tspan><tspan xml:space="preserve" x="10" y="248" class="output">◉ <tspan class="bold fg5">z</tspan><tspan class="fg8">zzzzzzz</tspan> <tspan class="fg2">root()</tspan> <tspan class="bold fg4">0</tspan><tspan class="fg8">0000000</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="266" class="output">$ jj diff -r first
|
||||
@ -63,68 +63,65 @@
|
||||
</tspan><tspan xml:space="preserve" x="10" y="464" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="482" class="output">$ jj rebase -s third -d first
|
||||
</tspan><tspan xml:space="preserve" x="10" y="500" class="output">Rebased 2 commits
|
||||
</tspan><tspan xml:space="preserve" x="10" y="518" class="output">Working copy now at: <tspan class="bold fg13">u</tspan><tspan class="bold fg8">pqsurwq</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">4d</tspan><tspan class="bold fg8">810169</tspan><tspan class="bold"> </tspan><tspan class="bold fg9">(conflict)</tspan><tspan class="bold"> </tspan><tspan class="bold fg10">(empty)</tspan><tspan class="bold"> </tspan><tspan class="bold fg10">(no description set)</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="536" class="output">Parent commit : <tspan class="bold fg5">l</tspan><tspan class="fg8">tqxzzvn</tspan> <tspan class="bold fg4">0a</tspan><tspan class="fg8">a4eff7</tspan> <tspan class="fg5">third</tspan><tspan class="fg8"> | </tspan><tspan class="fg1">(conflict)</tspan> third
|
||||
</tspan><tspan xml:space="preserve" x="10" y="518" class="output">Working copy now at: <tspan class="bold fg13">r</tspan><tspan class="bold fg8">trqxtor</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">b</tspan><tspan class="bold fg8">88d4fbd</tspan><tspan class="bold"> </tspan><tspan class="bold fg9">(conflict)</tspan><tspan class="bold"> </tspan><tspan class="bold fg10">(empty)</tspan><tspan class="bold"> </tspan><tspan class="bold fg10">(no description set)</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="536" class="output">Parent commit : <tspan class="bold fg5">q</tspan><tspan class="fg8">syokrkk</tspan> <tspan class="bold fg4">a</tspan><tspan class="fg8">b068262</tspan> <tspan class="fg5">third</tspan><tspan class="fg8"> | </tspan><tspan class="fg1">(conflict)</tspan> third
|
||||
</tspan><tspan xml:space="preserve" x="10" y="554" class="output">Added 0 files, modified 1 files, removed 0 files
|
||||
</tspan><tspan xml:space="preserve" x="10" y="572" class="output">$ jj rebase -s second -d third
|
||||
</tspan><tspan xml:space="preserve" x="10" y="590" class="output">Rebased 1 commits
|
||||
</tspan><tspan xml:space="preserve" x="10" y="608" class="output">$ jj log
|
||||
</tspan><tspan xml:space="preserve" x="10" y="626" class="output">◉ <tspan class="bold fg5">n</tspan><tspan class="fg8">rlsumvr</tspan> <tspan class="fg3">jjfan@example.com</tspan> <tspan class="fg6">2023-10-01 22:29:22.435 -07:00</tspan> <tspan class="fg5">second</tspan> <tspan class="bold fg4">a</tspan><tspan class="fg8">8e2d400</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="626" class="output">◉ <tspan class="bold fg5">p</tspan><tspan class="fg8">mlzoorv</tspan> <tspan class="fg3">jjfan@example.com</tspan> <tspan class="fg6">2023-10-03 17:52:07.615 -07:00</tspan> <tspan class="fg5">second</tspan> <tspan class="bold fg4">6</tspan><tspan class="fg8">0ef6ed1</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="644" class="output">│ second
|
||||
</tspan><tspan xml:space="preserve" x="10" y="662" class="output">│ @ <tspan class="bold fg13">u</tspan><tspan class="bold fg8">pqsurwq</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@example.com</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">2023-10-01 22:29:22.406 -07:00</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">4</tspan><tspan class="bold fg8">d810169</tspan><tspan class="bold"> </tspan><tspan class="bold fg9">conflict</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="662" class="output">│ @ <tspan class="bold fg13">r</tspan><tspan class="bold fg8">trqxtor</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@example.com</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">2023-10-03 17:52:07.583 -07:00</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">b</tspan><tspan class="bold fg8">88d4fbd</tspan><tspan class="bold"> </tspan><tspan class="bold fg9">conflict</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="680" class="output">├─╯ <tspan class="bold fg10">(empty)</tspan><tspan class="bold"> </tspan><tspan class="bold fg10">(no description set)</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="698" class="output">◉ <tspan class="bold fg5">l</tspan><tspan class="fg8">tqxzzvn</tspan> <tspan class="fg3">jjfan@example.com</tspan> <tspan class="fg6">2023-10-01 22:29:22.406 -07:00</tspan> <tspan class="fg5">third</tspan> <tspan class="bold fg4">0a</tspan><tspan class="fg8">a4eff7</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="698" class="output">◉ <tspan class="bold fg5">q</tspan><tspan class="fg8">syokrkk</tspan> <tspan class="fg3">jjfan@example.com</tspan> <tspan class="fg6">2023-10-03 17:52:07.583 -07:00</tspan> <tspan class="fg5">third</tspan> <tspan class="bold fg4">a</tspan><tspan class="fg8">b068262</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="716" class="output">│ <tspan class="fg1">conflict</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="734" class="output">│ third
|
||||
</tspan><tspan xml:space="preserve" x="10" y="752" class="output">◉ <tspan class="bold fg5">p</tspan><tspan class="fg8">umwmyut</tspan> <tspan class="fg3">jjfan@example.com</tspan> <tspan class="fg6">2023-10-01 22:29:22.147 -07:00</tspan> <tspan class="fg5">first</tspan> <tspan class="bold fg4">e</tspan><tspan class="fg8">b0ec5cc</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="752" class="output">◉ <tspan class="bold fg5">m</tspan><tspan class="fg8">zssttms</tspan> <tspan class="fg3">jjfan@example.com</tspan> <tspan class="fg6">2023-10-03 17:52:07.312 -07:00</tspan> <tspan class="fg5">first</tspan> <tspan class="bold fg4">c</tspan><tspan class="fg8">2cb2cfa</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="770" class="output">│ first
|
||||
</tspan><tspan xml:space="preserve" x="10" y="788" class="output">◉ <tspan class="bold fg5">z</tspan><tspan class="fg8">zzzzzzz</tspan> <tspan class="fg2">root()</tspan> <tspan class="bold fg4">00</tspan><tspan class="fg8">000000</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="788" class="output">◉ <tspan class="bold fg5">z</tspan><tspan class="fg8">zzzzzzz</tspan> <tspan class="fg2">root()</tspan> <tspan class="bold fg4">0</tspan><tspan class="fg8">0000000</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="806" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="824" class="output"><tspan class="fg2"># The commit labeled "third" has a conflict,</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="842" class="output"><tspan class="fg2"># as expected. What's more interesting is</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="860" class="output"><tspan class="fg2"># that the top commit has no conflict! That's</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="878" class="output"><tspan class="fg2"># because it has the changes from all three</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="896" class="output"><tspan class="fg2"># commits applied to it.</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="824" 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="842" 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="860" class="output"><tspan class="fg2"># has the changes from all three commits applied to it.</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="878" class="output"><tspan class="fg2"># </tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="896" class="output"><tspan class="fg2"># Let's verify that by looking at its contents:</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="914" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="932" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="950" class="output"><tspan class="fg2"># Let's verify that by looking at its contents:</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="968" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="986" class="output">$ jj co second
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1004" class="output">Working copy now at: <tspan class="bold fg13">m</tspan><tspan class="bold fg8">qslnlrv</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">e1</tspan><tspan class="bold fg8">967a3c</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="1022" class="output">Parent commit : <tspan class="bold fg5">n</tspan><tspan class="fg8">rlsumvr</tspan> <tspan class="bold fg4">a</tspan><tspan class="fg8">8e2d400</tspan> <tspan class="fg5">second</tspan><tspan class="fg8"> | </tspan>second
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1040" class="output">Added 0 files, modified 1 files, removed 0 files
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1058" class="output">$ cat file
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1076" class="output">third
|
||||
</tspan><tspan xml:space="preserve" x="10" y="932" class="output">$ jj co second
|
||||
</tspan><tspan xml:space="preserve" x="10" y="950" class="output">Working copy now at: <tspan class="bold fg13">pn</tspan><tspan class="bold fg8">tkxysq</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">d</tspan><tspan class="bold fg8">04ba185</tspan><tspan class="bold"> </tspan><tspan class="bold fg10">(empty)</tspan><tspan class="bold"> </tspan><tspan class="bold fg10">(no description set)</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="968" class="output">Parent commit : <tspan class="bold fg5">pm</tspan><tspan class="fg8">lzoorv</tspan> <tspan class="bold fg4">6</tspan><tspan class="fg8">0ef6ed1</tspan> <tspan class="fg5">second</tspan><tspan class="fg8"> | </tspan>second
|
||||
</tspan><tspan xml:space="preserve" x="10" y="986" class="output">Added 0 files, modified 1 files, removed 0 files
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1004" class="output">$ cat file
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1022" class="output">third
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1040" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1058" class="output"><tspan class="fg2"># Let's now instead make "second" and "third"</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1076" class="output"><tspan class="fg2"># sibling and merge them:</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1094" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1112" class="output"><tspan class="fg2"># Let's now instead make "second" and "third"</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1130" class="output"><tspan class="fg2"># sibling and merge them:</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1148" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1166" class="output">$ jj rebase -s second -d first
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1184" class="output">Rebased 2 commits
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1202" class="output">Working copy now at: <tspan class="bold fg13">m</tspan><tspan class="bold fg8">qslnlrv</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">7</tspan><tspan class="bold fg8">2803a85</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="1220" class="output">Parent commit : <tspan class="bold fg5">n</tspan><tspan class="fg8">rlsumvr</tspan> <tspan class="bold fg4">4</tspan><tspan class="fg8">b5d0b0d</tspan> <tspan class="fg5">second</tspan><tspan class="fg8"> | </tspan>second
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1238" class="output">Added 0 files, modified 1 files, removed 0 files
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1256" class="output">$ jj merge second third -m merged
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1274" class="output">Working copy now at: <tspan class="bold fg13">x</tspan><tspan class="bold fg8">pkuouzp</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">7</tspan><tspan class="bold fg8">390c074</tspan><tspan class="bold"> </tspan><tspan class="bold fg10">(empty)</tspan><tspan class="bold"> merged</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1292" class="output">Parent commit : <tspan class="bold fg5">n</tspan><tspan class="fg8">rlsumvr</tspan> <tspan class="bold fg4">4</tspan><tspan class="fg8">b5d0b0d</tspan> <tspan class="fg5">second</tspan><tspan class="fg8"> | </tspan>second
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1310" class="output">Parent commit : <tspan class="bold fg5">l</tspan><tspan class="fg8">tqxzzvn</tspan> <tspan class="bold fg4">0a</tspan><tspan class="fg8">a4eff7</tspan> <tspan class="fg5">third</tspan><tspan class="fg8"> | </tspan><tspan class="fg1">(conflict)</tspan> third
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1328" class="output">Added 0 files, modified 1 files, removed 0 files
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1346" class="output">$ jj log
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1364" class="output">@ <tspan class="bold fg13">x</tspan><tspan class="bold fg8">pkuouzp</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@example.com</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">2023-10-01 22:29:22.561 -07:00</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">7</tspan><tspan class="bold fg8">390c074</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1382" class="output">├─╮ <tspan class="bold fg10">(empty)</tspan><tspan class="bold"> merged</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1400" class="output">│ ◉ <tspan class="bold fg5">l</tspan><tspan class="fg8">tqxzzvn</tspan> <tspan class="fg3">jjfan@example.com</tspan> <tspan class="fg6">2023-10-01 22:29:22.406 -07:00</tspan> <tspan class="fg5">third</tspan> <tspan class="bold fg4">0a</tspan><tspan class="fg8">a4eff7</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1418" class="output">│ │ <tspan class="fg1">conflict</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1436" class="output">│ │ third
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1454" class="output">◉ │ <tspan class="bold fg5">n</tspan><tspan class="fg8">rlsumvr</tspan> <tspan class="fg3">jjfan@example.com</tspan> <tspan class="fg6">2023-10-01 22:29:22.530 -07:00</tspan> <tspan class="fg5">second</tspan> <tspan class="bold fg4">4</tspan><tspan class="fg8">b5d0b0d</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1472" class="output">├─╯ second
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1490" class="output">◉ <tspan class="bold fg5">p</tspan><tspan class="fg8">umwmyut</tspan> <tspan class="fg3">jjfan@example.com</tspan> <tspan class="fg6">2023-10-01 22:29:22.147 -07:00</tspan> <tspan class="fg5">first</tspan> <tspan class="bold fg4">e</tspan><tspan class="fg8">b0ec5cc</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1508" class="output">│ first
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1526" class="output">◉ <tspan class="bold fg5">z</tspan><tspan class="fg8">zzzzzzz</tspan> <tspan class="fg2">root()</tspan> <tspan class="bold fg4">00</tspan><tspan class="fg8">000000</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1544" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1562" class="output"><tspan class="fg2"># Again, because the merge commit has the</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1580" class="output"><tspan class="fg2"># changes from all three commits, it has no</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1598" class="output"><tspan class="fg2"># conflict.</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1616" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1112" class="output">$ jj rebase -s second -d first
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1130" class="output">Rebased 2 commits
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1148" class="output">Working copy now at: <tspan class="bold fg13">pn</tspan><tspan class="bold fg8">tkxysq</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">8</tspan><tspan class="bold fg8">e1a878a</tspan><tspan class="bold"> </tspan><tspan class="bold fg10">(empty)</tspan><tspan class="bold"> </tspan><tspan class="bold fg10">(no description set)</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1166" class="output">Parent commit : <tspan class="bold fg5">pm</tspan><tspan class="fg8">lzoorv</tspan> <tspan class="bold fg4">a4</tspan><tspan class="fg8">f3850e</tspan> <tspan class="fg5">second</tspan><tspan class="fg8"> | </tspan>second
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1184" class="output">Added 0 files, modified 1 files, removed 0 files
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1202" class="output">$ jj merge second third -m merged
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1220" class="output">Working copy now at: <tspan class="bold fg13">t</tspan><tspan class="bold fg8">rtwrukv</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">1</tspan><tspan class="bold fg8">b5ba1cc</tspan><tspan class="bold"> </tspan><tspan class="bold fg10">(empty)</tspan><tspan class="bold"> merged</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1238" class="output">Parent commit : <tspan class="bold fg5">p</tspan><tspan class="fg8">mlzoorv</tspan> <tspan class="bold fg4">a4</tspan><tspan class="fg8">f3850e</tspan> <tspan class="fg5">second</tspan><tspan class="fg8"> | </tspan>second
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1256" class="output">Parent commit : <tspan class="bold fg5">q</tspan><tspan class="fg8">syokrkk</tspan> <tspan class="bold fg4">ab</tspan><tspan class="fg8">068262</tspan> <tspan class="fg5">third</tspan><tspan class="fg8"> | </tspan><tspan class="fg1">(conflict)</tspan> third
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1274" class="output">Added 0 files, modified 1 files, removed 0 files
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1292" class="output">$ jj log
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1310" class="output">@ <tspan class="bold fg13">t</tspan><tspan class="bold fg8">rtwrukv</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@example.com</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">2023-10-03 17:52:07.739 -07:00</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">1</tspan><tspan class="bold fg8">b5ba1cc</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1328" class="output">├─╮ <tspan class="bold fg10">(empty)</tspan><tspan class="bold"> merged</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1346" class="output">│ ◉ <tspan class="bold fg5">q</tspan><tspan class="fg8">syokrkk</tspan> <tspan class="fg3">jjfan@example.com</tspan> <tspan class="fg6">2023-10-03 17:52:07.583 -07:00</tspan> <tspan class="fg5">third</tspan> <tspan class="bold fg4">ab</tspan><tspan class="fg8">068262</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1364" class="output">│ │ <tspan class="fg1">conflict</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1382" class="output">│ │ third
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1400" class="output">◉ │ <tspan class="bold fg5">p</tspan><tspan class="fg8">mlzoorv</tspan> <tspan class="fg3">jjfan@example.com</tspan> <tspan class="fg6">2023-10-03 17:52:07.708 -07:00</tspan> <tspan class="fg5">second</tspan> <tspan class="bold fg4">a4</tspan><tspan class="fg8">f3850e</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1418" class="output">├─╯ second
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1436" class="output">◉ <tspan class="bold fg5">m</tspan><tspan class="fg8">zssttms</tspan> <tspan class="fg3">jjfan@example.com</tspan> <tspan class="fg6">2023-10-03 17:52:07.312 -07:00</tspan> <tspan class="fg5">first</tspan> <tspan class="bold fg4">c</tspan><tspan class="fg8">2cb2cfa</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1454" class="output">│ first
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1472" class="output">◉ <tspan class="bold fg5">z</tspan><tspan class="fg8">zzzzzzz</tspan> <tspan class="fg2">root()</tspan> <tspan class="bold fg4">0</tspan><tspan class="fg8">0000000</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1490" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1508" class="output"><tspan class="fg2"># Again, because the merge commit has the</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1526" class="output"><tspan class="fg2"># changes from all three commits, it has no</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1544" class="output"><tspan class="fg2"># conflict.</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1562" class="output">
|
||||
</tspan></text>
|
||||
</svg>
|
||||
</svg>
|
||||
|
||||
|
Before Width: | Height: | Size: 17 KiB After Width: | Height: | Size: 17 KiB |
@ -1,5 +1,5 @@
|
||||
<!-- 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>
|
||||
.container {
|
||||
font: 14px Fira Code, Liberation Mono, SFMono-Regular, Consolas, Menlo, monospace;
|
||||
@ -33,7 +33,7 @@
|
||||
.fg15 { fill: #f2f2f2; } .output-bg .fg15 { stroke: #f2f2f2; }
|
||||
</style>
|
||||
<rect width="100%" height="100%" y="0" rx="4.5" style="fill: #0c0c0c;" />
|
||||
<svg x="0" y="10" width="720" height="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>
|
||||
<text class="container fg7"><tspan xml:space="preserve" x="10" y="14" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="32" class="output"><tspan class="fg2"># We are in the octocat/Hello-World repo.</tspan>
|
||||
@ -41,15 +41,15 @@
|
||||
</tspan><tspan xml:space="preserve" x="10" y="68" class="output"><tspan class="fg2"># so far:</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="86" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="104" class="output">$ jj op log
|
||||
</tspan><tspan xml:space="preserve" x="10" y="122" class="output">@ <tspan class="bold fg12">fa79b3466874</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 fg12">845481e61aaa</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@jujube</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">now, lasted 1 millisecond</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="140" class="output">│ <tspan class="bold">check out git remote's default branch</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="158" class="output">│ <tspan class="bold fg5">args: jj git clone https://github.com/octocat/Hello-World</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="176" class="output">◉ <tspan class="fg4">b9f3854e4c6b</tspan> <tspan class="fg3">jjfan@jujube</tspan> <tspan class="fg6">now, lasted 444 milliseconds</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="176" class="output">◉ <tspan class="fg4">f8c5a185ca4c</tspan> <tspan class="fg3">jjfan@jujube</tspan> <tspan class="fg6">now, lasted 392 milliseconds</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="194" class="output">│ fetch from git remote into empty repo
|
||||
</tspan><tspan xml:space="preserve" x="10" y="212" class="output">│ <tspan class="fg5">args: jj git clone https://github.com/octocat/Hello-World</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="230" class="output">◉ <tspan class="fg4">3eed56af5757</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="230" class="output">◉ <tspan class="fg4">5c7d32912b0b</tspan> <tspan class="fg3">jjfan@jujube</tspan> <tspan class="fg6">now, lasted 1 millisecond</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="248" class="output">│ add workspace 'default'
|
||||
</tspan><tspan xml:space="preserve" x="10" y="266" class="output">◉ <tspan class="fg4">6f3495125bc8</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="266" class="output">◉ <tspan class="fg4">0fdc6a086c35</tspan> <tspan class="fg3">jjfan@jujube</tspan> <tspan class="fg6">now, lasted less than a microsecond</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="284" class="output"> initialize repo
|
||||
</tspan><tspan xml:space="preserve" x="10" y="302" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="320" class="output"><tspan class="fg2"># We are going to make some changes to show</tspan>
|
||||
@ -58,12 +58,12 @@
|
||||
</tspan><tspan xml:space="preserve" x="10" y="374" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="392" class="output">$ echo stuff > new-file
|
||||
</tspan><tspan xml:space="preserve" x="10" y="410" class="output">$ jj describe -m stuff
|
||||
</tspan><tspan xml:space="preserve" x="10" y="428" class="output">Working copy now at: <tspan class="bold fg13">x</tspan><tspan class="bold fg8">trplzoo</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">e</tspan><tspan class="bold fg8">b5aa286</tspan><tspan class="bold"> stuff</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="428" class="output">Working copy now at: <tspan class="bold fg13">s</tspan><tspan class="bold fg8">tlkvnrx</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">a</tspan><tspan class="bold fg8">b94989a</tspan><tspan class="bold"> stuff</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="446" class="output">Parent commit : <tspan class="bold fg5">o</tspan><tspan class="fg8">rrkosyo</tspan> <tspan class="bold fg4">7</tspan><tspan class="fg8">fd1a60b</tspan> <tspan class="fg5">master</tspan><tspan class="fg8"> | </tspan><tspan class="fg2">(empty)</tspan> Merge pull request #6 fr<tspan class="hard-br" rotate="45" dx=".1em" dy="-.2em">↓</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="464" class="output">om Spaceghost/patch-1
|
||||
</tspan><tspan xml:space="preserve" x="10" y="482" class="output">$ jj rebase -d test
|
||||
</tspan><tspan xml:space="preserve" x="10" y="500" class="output">Rebased 1 commits
|
||||
</tspan><tspan xml:space="preserve" x="10" y="518" class="output">Working copy now at: <tspan class="bold fg13">x</tspan><tspan class="bold fg8">trplzoo</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">8</tspan><tspan class="bold fg8">c520228</tspan><tspan class="bold"> stuff</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="518" class="output">Working copy now at: <tspan class="bold fg13">s</tspan><tspan class="bold fg8">tlkvnrx</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">4</tspan><tspan class="bold fg8">7f07ef4</tspan><tspan class="bold"> stuff</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="536" class="output">Parent commit : <tspan class="bold fg5">k</tspan><tspan class="fg8">owxouwz</tspan> <tspan class="bold fg4">b3</tspan><tspan class="fg8">cbd5bb</tspan> <tspan class="fg5">test</tspan><tspan class="fg8"> | </tspan>Create CONTRIBUTING.md
|
||||
</tspan><tspan xml:space="preserve" x="10" y="554" class="output">Added 1 files, modified 0 files, removed 0 files
|
||||
</tspan><tspan xml:space="preserve" x="10" y="572" class="output">
|
||||
@ -71,104 +71,106 @@
|
||||
</tspan><tspan xml:space="preserve" x="10" y="608" class="output"><tspan class="fg2"># master:</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="626" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="644" class="output">$ jj co master
|
||||
</tspan><tspan xml:space="preserve" x="10" y="662" class="output">Working copy now at: <tspan class="bold fg13">ok</tspan><tspan class="bold fg8">qrllkp</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">7c</tspan><tspan class="bold fg8">e6d4fb</tspan><tspan class="bold"> </tspan><tspan class="bold fg10">(empty)</tspan><tspan class="bold"> </tspan><tspan class="bold fg10">(no description set)</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="680" class="output">Parent commit : <tspan class="bold fg5">or</tspan><tspan class="fg8">rkosyo</tspan> <tspan class="bold fg4">7f</tspan><tspan class="fg8">d1a60b</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="662" class="output">Working copy now at: <tspan class="bold fg13">y</tspan><tspan class="bold fg8">uknqtsx</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">f</tspan><tspan class="bold fg8">18fb500</tspan><tspan class="bold"> </tspan><tspan class="bold fg10">(empty)</tspan><tspan class="bold"> </tspan><tspan class="bold fg10">(no description set)</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="680" class="output">Parent commit : <tspan class="bold fg5">o</tspan><tspan class="fg8">rrkosyo</tspan> <tspan class="bold fg4">7</tspan><tspan class="fg8">fd1a60b</tspan> <tspan class="fg5">master</tspan><tspan class="fg8"> | </tspan><tspan class="fg2">(empty)</tspan> Merge pull request #6 fr<tspan class="hard-br" rotate="45" dx=".1em" dy="-.2em">↓</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="698" class="output">om Spaceghost/patch-1
|
||||
</tspan><tspan xml:space="preserve" x="10" y="716" class="output">Added 0 files, modified 0 files, removed 2 files
|
||||
</tspan><tspan xml:space="preserve" x="10" y="734" class="output">$ jj describe -m "other stuff"
|
||||
</tspan><tspan xml:space="preserve" x="10" y="752" class="output">Working copy now at: <tspan class="bold fg13">ok</tspan><tspan class="bold fg8">qrllkp</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">79</tspan><tspan class="bold fg8">2d0b92</tspan><tspan class="bold"> </tspan><tspan class="bold fg10">(empty)</tspan><tspan class="bold"> other stuff</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="770" class="output">Parent commit : <tspan class="bold fg5">or</tspan><tspan class="fg8">rkosyo</tspan> <tspan class="bold fg4">7f</tspan><tspan class="fg8">d1a60b</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="752" class="output">Working copy now at: <tspan class="bold fg13">y</tspan><tspan class="bold fg8">uknqtsx</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">1</tspan><tspan class="bold fg8">2e96f12</tspan><tspan class="bold"> </tspan><tspan class="bold fg10">(empty)</tspan><tspan class="bold"> other stuff</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="770" class="output">Parent commit : <tspan class="bold fg5">o</tspan><tspan class="fg8">rrkosyo</tspan> <tspan class="bold fg4">7</tspan><tspan class="fg8">fd1a60b</tspan> <tspan class="fg5">master</tspan><tspan class="fg8"> | </tspan><tspan class="fg2">(empty)</tspan> Merge pull request #6 fr<tspan class="hard-br" rotate="45" dx=".1em" dy="-.2em">↓</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="788" class="output">om Spaceghost/patch-1
|
||||
</tspan><tspan xml:space="preserve" x="10" y="806" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="824" class="output"><tspan class="fg2"># The repo now looks like this:</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="842" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="860" class="output">$ jj log
|
||||
</tspan><tspan xml:space="preserve" x="10" y="878" class="output">@ <tspan class="bold fg13">ok</tspan><tspan class="bold fg8">qrllkp</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@example.com</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">2023-10-01 22:29:23.000 -07:00</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">79</tspan><tspan class="bold fg8">2d0b92</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="878" class="output">@ <tspan class="bold fg13">y</tspan><tspan class="bold fg8">uknqtsx</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@example.com</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">2023-10-03 17:52:08.000 -07:00</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">1</tspan><tspan class="bold fg8">2e96f12</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="896" class="output">│ <tspan class="bold fg10">(empty)</tspan><tspan class="bold"> other stuff</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="914" class="output">│ ◉ <tspan class="bold fg5">t</tspan><tspan class="fg8">pstlust</tspan> <tspan class="fg3">support+octocat@github.com</tspan> <tspan class="fg6">2018-05-10 12:55:19.000 -05:00</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="932" class="output">├─╯ <tspan class="fg5">octocat-patch-1</tspan> <tspan class="bold fg4">b1</tspan><tspan class="fg8">b3f972</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="950" class="output">│ sentence case
|
||||
</tspan><tspan xml:space="preserve" x="10" y="968" class="output">│ ◉ <tspan class="bold fg5">x</tspan><tspan class="fg8">trplzoo</tspan> <tspan class="fg3">jjfan@example.com</tspan> <tspan class="fg6">2023-10-01 22:29:23.000 -07:00</tspan> <tspan class="bold fg4">8</tspan><tspan class="fg8">c520228</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="968" class="output">│ ◉ <tspan class="bold fg5">s</tspan><tspan class="fg8">tlkvnrx</tspan> <tspan class="fg3">jjfan@example.com</tspan> <tspan class="fg6">2023-10-03 17:52:08.000 -07:00</tspan> <tspan class="bold fg4">4</tspan><tspan class="fg8">7f07ef4</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="986" class="output">│ │ stuff
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1004" class="output">│ ◉ <tspan class="bold fg5">k</tspan><tspan class="fg8">owxouwz</tspan> <tspan class="fg3">octocat@nowhere.com</tspan> <tspan class="fg6">2014-06-10 15:22:26.000 -07:00</tspan> <tspan class="fg5">test</tspan> <tspan class="bold fg4">b3</tspan><tspan class="fg8">cbd5bb</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1022" class="output">├─╯ Create CONTRIBUTING.md
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1040" class="output">◉ <tspan class="bold fg5">or</tspan><tspan class="fg8">rkosyo</tspan> <tspan class="fg3">octocat@nowhere.com</tspan> <tspan class="fg6">2012-03-06 15:06:50.000 -08:00</tspan> <tspan class="fg5">master</tspan> <tspan class="bold fg4">7f</tspan><tspan class="fg8">d1a60b</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1040" class="output">◉ <tspan class="bold fg5">o</tspan><tspan class="fg8">rrkosyo</tspan> <tspan class="fg3">octocat@nowhere.com</tspan> <tspan class="fg6">2012-03-06 15:06:50.000 -08:00</tspan> <tspan class="fg5">master</tspan> <tspan class="bold fg4">7</tspan><tspan class="fg8">fd1a60b</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1058" class="output">│ <tspan class="fg2">(empty)</tspan> Merge pull request #6 from Spaceghost/patch-1
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1076" class="output">~
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1094" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1112" class="output"><tspan class="fg2"># The most recent portion of the operation log</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1130" class="output"><tspan class="fg2"># is:</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1148" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1166" class="output">$ jj op log | head
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1184" class="output">@ <tspan class="bold fg12">5bae9d9b6a8a</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@jujube</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">now, lasted 1 millisecond</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1202" class="output">│ <tspan class="bold">describe commit 7ce6d4fb5acb6945fd0301187a03245b49fe6b71</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1166" class="output">$ jj op log --limit 4
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1184" class="output">@ <tspan class="bold fg12">0fac552f4f72</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@jujube</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">now, lasted 1 millisecond</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1202" class="output">│ <tspan class="bold">describe commit f18fb50012d764655037a7bb4cee0172691e5681</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1220" class="output">│ <tspan class="bold fg5">args: jj describe -m 'other stuff'</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1238" class="output">◉ <tspan class="fg4">99a3111903cc</tspan> <tspan class="fg3">jjfan@jujube</tspan> <tspan class="fg6">now, lasted 1 millisecond</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1238" class="output">◉ <tspan class="fg4">dc729a65a24b</tspan> <tspan class="fg3">jjfan@jujube</tspan> <tspan class="fg6">now, lasted 1 millisecond</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1256" class="output">│ check out commit 7fd1a60b01f91b314f59955a4e4d4e80d8edf11d
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1274" class="output">│ <tspan class="fg5">args: jj co master</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1292" class="output">◉ <tspan class="fg4">5cdf49cce8a4</tspan> <tspan class="fg3">jjfan@jujube</tspan> <tspan class="fg6">now, lasted 1 millisecond</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1310" class="output">│ rebase commit eb5aa28675c23f6664c1027aae91f13bf5e3c474 and descendants
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1292" class="output">◉ <tspan class="fg4">99af13f4bea1</tspan> <tspan class="fg3">jjfan@jujube</tspan> <tspan class="fg6">now, lasted 1 millisecond</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1310" class="output">│ rebase commit ab94989ab0b20e569b934dcffba33e68ad780d2a and descendants
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1328" class="output">│ <tspan class="fg5">args: jj rebase -d test</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1346" class="output">◉ <tspan class="fg4">74cd4da2188d</tspan> <tspan class="fg3">jjfan@jujube</tspan> <tspan class="fg6">now, lasted 1 millisecond</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1364" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1382" class="output"><tspan class="fg2"># Let's undo that rebase operation:</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1346" class="output">◉ <tspan class="fg4">9cc7474d42a1</tspan> <tspan class="fg3">jjfan@jujube</tspan> <tspan class="fg6">now, lasted 1 millisecond</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1364" class="output">│ describe commit 47b41c1661fc8428b0f03641cab2b7a08c439e6c
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1382" class="output">│ <tspan class="fg5">args: jj describe -m stuff</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1400" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1418" class="output">$ jj undo 5cdf4
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1418" class="output"><tspan class="fg2"># Let's undo that rebase operation:</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1436" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1454" class="output"><tspan class="fg2"># Note that only the rebase was undone, and the</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1472" class="output"><tspan class="fg2"># subsequent "other stuff" change was not undone:</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1490" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1508" class="output">$ jj log
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1526" class="output">@ <tspan class="bold fg13">ok</tspan><tspan class="bold fg8">qrllkp</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@example.com</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">2023-10-01 22:29:23.000 -07:00</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">79</tspan><tspan class="bold fg8">2d0b92</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1544" class="output">│ <tspan class="bold fg10">(empty)</tspan><tspan class="bold"> other stuff</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1562" class="output">│ ◉ <tspan class="bold fg5">x</tspan><tspan class="fg8">trplzoo</tspan> <tspan class="fg3">jjfan@example.com</tspan> <tspan class="fg6">2023-10-01 22:29:23.000 -07:00</tspan> <tspan class="bold fg4">e</tspan><tspan class="fg8">b5aa286</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1580" class="output">├─╯ stuff
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1598" class="output">│ ◉ <tspan class="bold fg5">t</tspan><tspan class="fg8">pstlust</tspan> <tspan class="fg3">support+octocat@github.com</tspan> <tspan class="fg6">2018-05-10 12:55:19.000 -05:00</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1616" class="output">├─╯ <tspan class="fg5">octocat-patch-1</tspan> <tspan class="bold fg4">b1</tspan><tspan class="fg8">b3f972</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1634" class="output">│ sentence case
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1652" class="output">│ ◉ <tspan class="bold fg5">k</tspan><tspan class="fg8">owxouwz</tspan> <tspan class="fg3">octocat@nowhere.com</tspan> <tspan class="fg6">2014-06-10 15:22:26.000 -07:00</tspan> <tspan class="fg5">test</tspan> <tspan class="bold fg4">b3</tspan><tspan class="fg8">cbd5bb</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1670" class="output">├─╯ Create CONTRIBUTING.md
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1688" class="output">◉ <tspan class="bold fg5">or</tspan><tspan class="fg8">rkosyo</tspan> <tspan class="fg3">octocat@nowhere.com</tspan> <tspan class="fg6">2012-03-06 15:06:50.000 -08:00</tspan> <tspan class="fg5">master</tspan> <tspan class="bold fg4">7f</tspan><tspan class="fg8">d1a60b</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1706" class="output">│ <tspan class="fg2">(empty)</tspan> Merge pull request #6 from Spaceghost/patch-1
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1724" class="output">~
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1742" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1760" class="output"><tspan class="fg2"># We can also see what the repo looked like</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1778" class="output"><tspan class="fg2"># after the rebase operation:</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1796" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1814" class="output">$ jj --at-op 5cdf4 log
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1832" class="output">@ <tspan class="bold fg13">x</tspan><tspan class="bold fg8">trplzoo</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@example.com</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">2023-10-01 22:29:23.000 -07:00</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">8</tspan><tspan class="bold fg8">c520228</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1850" class="output">│ <tspan class="bold">stuff</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1868" class="output">◉ <tspan class="bold fg5">k</tspan><tspan class="fg8">owxouwz</tspan> <tspan class="fg3">octocat@nowhere.com</tspan> <tspan class="fg6">2014-06-10 15:22:26.000 -07:00</tspan> <tspan class="fg5">test</tspan> <tspan class="bold fg4">b3</tspan><tspan class="fg8">cbd5bb</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1886" class="output">│ Create CONTRIBUTING.md
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1904" class="output">│ ◉ <tspan class="bold fg5">t</tspan><tspan class="fg8">pstlust</tspan> <tspan class="fg3">support+octocat@github.com</tspan> <tspan class="fg6">2018-05-10 12:55:19.000 -05:00</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1922" class="output">├─╯ <tspan class="fg5">octocat-patch-1</tspan> <tspan class="bold fg4">b1</tspan><tspan class="fg8">b3f972</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1940" class="output">│ sentence case
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1958" class="output">◉ <tspan class="bold fg5">o</tspan><tspan class="fg8">rrkosyo</tspan> <tspan class="fg3">octocat@nowhere.com</tspan> <tspan class="fg6">2012-03-06 15:06:50.000 -08:00</tspan> <tspan class="fg5">master</tspan> <tspan class="bold fg4">7</tspan><tspan class="fg8">fd1a60b</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1976" class="output">│ <tspan class="fg2">(empty)</tspan> Merge pull request #6 from Spaceghost/patch-1
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1994" class="output">~
|
||||
</tspan><tspan xml:space="preserve" x="10" y="2012" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="2030" 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="2048" class="output"><tspan class="fg2"># state of the repo right after the rebase:</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="2066" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="2084" class="output">$ jj op restore 5cdf4
|
||||
</tspan><tspan xml:space="preserve" x="10" y="2102" class="output">Working copy now at: <tspan class="bold fg13">x</tspan><tspan class="bold fg8">trplzoo</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">8</tspan><tspan class="bold fg8">c520228</tspan><tspan class="bold"> stuff</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="2120" class="output">Parent commit : <tspan class="bold fg5">k</tspan><tspan class="fg8">owxouwz</tspan> <tspan class="bold fg4">b3</tspan><tspan class="fg8">cbd5bb</tspan> <tspan class="fg5">test</tspan><tspan class="fg8"> | </tspan>Create CONTRIBUTING.md
|
||||
</tspan><tspan xml:space="preserve" x="10" y="2138" class="output">Added 2 files, modified 0 files, removed 0 files
|
||||
</tspan><tspan xml:space="preserve" x="10" y="2156" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="2174" class="output"><tspan class="fg2"># We're now back to before the "other stuff"</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="2192" class="output"><tspan class="fg2"># change existed:</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="2210" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="2228" class="output">$ jj log
|
||||
</tspan><tspan xml:space="preserve" x="10" y="2246" class="output">@ <tspan class="bold fg13">x</tspan><tspan class="bold fg8">trplzoo</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@example.com</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">2023-10-01 22:29:23.000 -07:00</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">8</tspan><tspan class="bold fg8">c520228</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="2264" class="output">│ <tspan class="bold">stuff</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="2282" class="output">◉ <tspan class="bold fg5">k</tspan><tspan class="fg8">owxouwz</tspan> <tspan class="fg3">octocat@nowhere.com</tspan> <tspan class="fg6">2014-06-10 15:22:26.000 -07:00</tspan> <tspan class="fg5">test</tspan> <tspan class="bold fg4">b3</tspan><tspan class="fg8">cbd5bb</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="2300" class="output">│ Create CONTRIBUTING.md
|
||||
</tspan><tspan xml:space="preserve" x="10" y="2318" class="output">│ ◉ <tspan class="bold fg5">t</tspan><tspan class="fg8">pstlust</tspan> <tspan class="fg3">support+octocat@github.com</tspan> <tspan class="fg6">2018-05-10 12:55:19.000 -05:00</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="2336" class="output">├─╯ <tspan class="fg5">octocat-patch-1</tspan> <tspan class="bold fg4">b1</tspan><tspan class="fg8">b3f972</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="2354" class="output">│ sentence case
|
||||
</tspan><tspan xml:space="preserve" x="10" y="2372" class="output">◉ <tspan class="bold fg5">o</tspan><tspan class="fg8">rrkosyo</tspan> <tspan class="fg3">octocat@nowhere.com</tspan> <tspan class="fg6">2012-03-06 15:06:50.000 -08:00</tspan> <tspan class="fg5">master</tspan> <tspan class="bold fg4">7</tspan><tspan class="fg8">fd1a60b</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="2390" class="output">│ <tspan class="fg2">(empty)</tspan> Merge pull request #6 from Spaceghost/patch-1
|
||||
</tspan><tspan xml:space="preserve" x="10" y="2408" class="output">~
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1454" class="output">$ jj undo 99af1
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1472" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1490" class="output"><tspan class="fg2"># Note that only the rebase was undone, and the</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1508" class="output"><tspan class="fg2"># subsequent "other stuff" change was not undone:</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1526" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1544" class="output">$ jj log
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1562" class="output">@ <tspan class="bold fg13">y</tspan><tspan class="bold fg8">uknqtsx</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@example.com</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">2023-10-03 17:52:08.000 -07:00</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">1</tspan><tspan class="bold fg8">2e96f12</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1580" class="output">│ <tspan class="bold fg10">(empty)</tspan><tspan class="bold"> other stuff</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1598" class="output">│ ◉ <tspan class="bold fg5">s</tspan><tspan class="fg8">tlkvnrx</tspan> <tspan class="fg3">jjfan@example.com</tspan> <tspan class="fg6">2023-10-03 17:52:08.000 -07:00</tspan> <tspan class="bold fg4">a</tspan><tspan class="fg8">b94989a</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1616" class="output">├─╯ stuff
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1634" class="output">│ ◉ <tspan class="bold fg5">t</tspan><tspan class="fg8">pstlust</tspan> <tspan class="fg3">support+octocat@github.com</tspan> <tspan class="fg6">2018-05-10 12:55:19.000 -05:00</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1652" class="output">├─╯ <tspan class="fg5">octocat-patch-1</tspan> <tspan class="bold fg4">b1</tspan><tspan class="fg8">b3f972</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1670" class="output">│ sentence case
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1688" class="output">│ ◉ <tspan class="bold fg5">k</tspan><tspan class="fg8">owxouwz</tspan> <tspan class="fg3">octocat@nowhere.com</tspan> <tspan class="fg6">2014-06-10 15:22:26.000 -07:00</tspan> <tspan class="fg5">test</tspan> <tspan class="bold fg4">b3</tspan><tspan class="fg8">cbd5bb</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1706" class="output">├─╯ Create CONTRIBUTING.md
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1724" class="output">◉ <tspan class="bold fg5">o</tspan><tspan class="fg8">rrkosyo</tspan> <tspan class="fg3">octocat@nowhere.com</tspan> <tspan class="fg6">2012-03-06 15:06:50.000 -08:00</tspan> <tspan class="fg5">master</tspan> <tspan class="bold fg4">7</tspan><tspan class="fg8">fd1a60b</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1742" class="output">│ <tspan class="fg2">(empty)</tspan> Merge pull request #6 from Spaceghost/patch-1
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1760" class="output">~
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1778" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1796" class="output"><tspan class="fg2"># We can also see what the repo looked like</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1814" class="output"><tspan class="fg2"># after the rebase operation:</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1832" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1850" class="output">$ jj --at-op 99af1 log
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1868" class="output">@ <tspan class="bold fg13">s</tspan><tspan class="bold fg8">tlkvnrx</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@example.com</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">2023-10-03 17:52:08.000 -07:00</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">4</tspan><tspan class="bold fg8">7f07ef4</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1886" class="output">│ <tspan class="bold">stuff</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1904" class="output">◉ <tspan class="bold fg5">k</tspan><tspan class="fg8">owxouwz</tspan> <tspan class="fg3">octocat@nowhere.com</tspan> <tspan class="fg6">2014-06-10 15:22:26.000 -07:00</tspan> <tspan class="fg5">test</tspan> <tspan class="bold fg4">b3</tspan><tspan class="fg8">cbd5bb</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1922" class="output">│ Create CONTRIBUTING.md
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1940" class="output">│ ◉ <tspan class="bold fg5">t</tspan><tspan class="fg8">pstlust</tspan> <tspan class="fg3">support+octocat@github.com</tspan> <tspan class="fg6">2018-05-10 12:55:19.000 -05:00</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1958" class="output">├─╯ <tspan class="fg5">octocat-patch-1</tspan> <tspan class="bold fg4">b1</tspan><tspan class="fg8">b3f972</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1976" class="output">│ sentence case
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1994" class="output">◉ <tspan class="bold fg5">o</tspan><tspan class="fg8">rrkosyo</tspan> <tspan class="fg3">octocat@nowhere.com</tspan> <tspan class="fg6">2012-03-06 15:06:50.000 -08:00</tspan> <tspan class="fg5">master</tspan> <tspan class="bold fg4">7</tspan><tspan class="fg8">fd1a60b</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="2012" class="output">│ <tspan class="fg2">(empty)</tspan> Merge pull request #6 from Spaceghost/patch-1
|
||||
</tspan><tspan xml:space="preserve" x="10" y="2030" class="output">~
|
||||
</tspan><tspan xml:space="preserve" x="10" y="2048" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="2066" class="output"><tspan class="fg2"># Let's say we instead want to go back to the</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="2084" class="output"><tspan class="fg2"># state of the repo right after the rebase:</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="2102" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="2120" class="output">$ jj op restore 99af1
|
||||
</tspan><tspan xml:space="preserve" x="10" y="2138" class="output">Working copy now at: <tspan class="bold fg13">s</tspan><tspan class="bold fg8">tlkvnrx</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">4</tspan><tspan class="bold fg8">7f07ef4</tspan><tspan class="bold"> stuff</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="2156" class="output">Parent commit : <tspan class="bold fg5">k</tspan><tspan class="fg8">owxouwz</tspan> <tspan class="bold fg4">b3</tspan><tspan class="fg8">cbd5bb</tspan> <tspan class="fg5">test</tspan><tspan class="fg8"> | </tspan>Create CONTRIBUTING.md
|
||||
</tspan><tspan xml:space="preserve" x="10" y="2174" class="output">Added 2 files, modified 0 files, removed 0 files
|
||||
</tspan><tspan xml:space="preserve" x="10" y="2192" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="2210" class="output"><tspan class="fg2"># We're now back to before the "other stuff"</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="2228" class="output"><tspan class="fg2"># change existed:</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="2246" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="2264" class="output">$ jj log
|
||||
</tspan><tspan xml:space="preserve" x="10" y="2282" class="output">@ <tspan class="bold fg13">s</tspan><tspan class="bold fg8">tlkvnrx</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@example.com</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">2023-10-03 17:52:08.000 -07:00</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">4</tspan><tspan class="bold fg8">7f07ef4</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="2300" class="output">│ <tspan class="bold">stuff</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="2318" class="output">◉ <tspan class="bold fg5">k</tspan><tspan class="fg8">owxouwz</tspan> <tspan class="fg3">octocat@nowhere.com</tspan> <tspan class="fg6">2014-06-10 15:22:26.000 -07:00</tspan> <tspan class="fg5">test</tspan> <tspan class="bold fg4">b3</tspan><tspan class="fg8">cbd5bb</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="2336" class="output">│ Create CONTRIBUTING.md
|
||||
</tspan><tspan xml:space="preserve" x="10" y="2354" class="output">│ ◉ <tspan class="bold fg5">t</tspan><tspan class="fg8">pstlust</tspan> <tspan class="fg3">support+octocat@github.com</tspan> <tspan class="fg6">2018-05-10 12:55:19.000 -05:00</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="2372" class="output">├─╯ <tspan class="fg5">octocat-patch-1</tspan> <tspan class="bold fg4">b1</tspan><tspan class="fg8">b3f972</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="2390" class="output">│ sentence case
|
||||
</tspan><tspan xml:space="preserve" x="10" y="2408" class="output">◉ <tspan class="bold fg5">o</tspan><tspan class="fg8">rrkosyo</tspan> <tspan class="fg3">octocat@nowhere.com</tspan> <tspan class="fg6">2012-03-06 15:06:50.000 -08:00</tspan> <tspan class="fg5">master</tspan> <tspan class="bold fg4">7</tspan><tspan class="fg8">fd1a60b</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="2426" class="output">│ <tspan class="fg2">(empty)</tspan> Merge pull request #6 from Spaceghost/patch-1
|
||||
</tspan><tspan xml:space="preserve" x="10" y="2444" class="output">~
|
||||
</tspan></text>
|
||||
</svg>
|
||||
</svg>
|
||||
|
||||
|
Before Width: | Height: | Size: 24 KiB After Width: | Height: | Size: 24 KiB |
@ -1,5 +1,5 @@
|
||||
<!-- Created with term-transcript v0.3.0 (https://github.com/slowli/term-transcript) -->
|
||||
<svg viewBox="0 0 720 1802" width="720" height="1802" xmlns="http://www.w3.org/2000/svg">
|
||||
<svg viewBox="0 0 720 1784" width="720" height="1784" xmlns="http://www.w3.org/2000/svg">
|
||||
<style>
|
||||
.container {
|
||||
font: 14px Fira Code, Liberation Mono, SFMono-Regular, Consolas, Menlo, monospace;
|
||||
@ -33,14 +33,14 @@
|
||||
.fg15 { fill: #f2f2f2; } .output-bg .fg15 { stroke: #f2f2f2; }
|
||||
</style>
|
||||
<rect width="100%" height="100%" y="0" rx="4.5" style="fill: #0c0c0c;" />
|
||||
<svg x="0" y="10" width="720" height="1782" viewBox="0 0 720 1782">
|
||||
<svg x="0" y="10" width="720" height="1764" viewBox="0 0 720 1764">
|
||||
<g class="input-bg"></g>
|
||||
<text class="container fg7"><tspan xml:space="preserve" x="10" y="14" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="32" class="output"><tspan class="fg2"># We are on the master branch of the</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="50" class="output"><tspan class="fg2"># octocat/Hello-World repo:</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="68" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="86" class="output">$ jj log -r 'all()'
|
||||
</tspan><tspan xml:space="preserve" x="10" y="104" class="output">@ <tspan class="bold fg13">x</tspan><tspan class="bold fg8">kmnkqsr</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@example.com</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">2023-10-01 22:29:25.000 -07:00</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">b6</tspan><tspan class="bold fg8">aec352</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="104" class="output">@ <tspan class="bold fg13">n</tspan><tspan class="bold fg8">rtkvytr</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@example.com</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">2023-10-03 17:52:10.000 -07:00</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">5</tspan><tspan class="bold fg8">863a062</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="122" class="output">│ <tspan class="bold fg10">(empty)</tspan><tspan class="bold"> </tspan><tspan class="bold fg10">(no description set)</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="140" class="output">│ ◉ <tspan class="bold fg5">t</tspan><tspan class="fg8">pstlust</tspan> <tspan class="fg3">support+octocat@github.com</tspan> <tspan class="fg6">2018-05-10 12:55:19.000 -05:00</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="158" class="output">├─╯ <tspan class="fg5">octocat-patch-1</tspan> <tspan class="bold fg4">b1</tspan><tspan class="fg8">b3f972</tspan>
|
||||
@ -49,10 +49,10 @@
|
||||
</tspan><tspan xml:space="preserve" x="10" y="212" class="output">├─╯ Create CONTRIBUTING.md
|
||||
</tspan><tspan xml:space="preserve" x="10" y="230" class="output">◉ <tspan class="bold fg5">o</tspan><tspan class="fg8">rrkosyo</tspan> <tspan class="fg3">octocat@nowhere.com</tspan> <tspan class="fg6">2012-03-06 15:06:50.000 -08:00</tspan> <tspan class="fg5">master</tspan> <tspan class="bold fg4">7</tspan><tspan class="fg8">fd1a60b</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="248" class="output">├─╮ <tspan class="fg2">(empty)</tspan> Merge pull request #6 from Spaceghost/patch-1
|
||||
</tspan><tspan xml:space="preserve" x="10" y="266" class="output">│ ◉ <tspan class="bold fg5">n</tspan><tspan class="fg8">znozkvv</tspan> <tspan class="fg3">Johnneylee.rollins@gmail.com</tspan> <tspan class="fg6">2011-09-13 21:42:41.000 -07:00</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="266" class="output">│ ◉ <tspan class="bold fg5">nz</tspan><tspan class="fg8">nozkvv</tspan> <tspan class="fg3">Johnneylee.rollins@gmail.com</tspan> <tspan class="fg6">2011-09-13 21:42:41.000 -07:00</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="284" class="output">├─╯ <tspan class="bold fg4">76</tspan><tspan class="fg8">294131</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="302" class="output">│ New line at end of file. --Signed off by Spaceghost
|
||||
</tspan><tspan xml:space="preserve" x="10" y="320" class="output">◉ <tspan class="bold fg5">s</tspan><tspan class="fg8">yktoqts</tspan> <tspan class="fg3">cameron@github.com</tspan> <tspan class="fg6">2011-01-26 11:06:08.000 -08:00</tspan> <tspan class="bold fg4">5</tspan><tspan class="fg8">53c2077</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="320" class="output">◉ <tspan class="bold fg5">s</tspan><tspan class="fg8">yktoqts</tspan> <tspan class="fg3">cameron@github.com</tspan> <tspan class="fg6">2011-01-26 11:06:08.000 -08:00</tspan> <tspan class="bold fg4">55</tspan><tspan class="fg8">3c2077</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="338" class="output">│ first commit
|
||||
</tspan><tspan xml:space="preserve" x="10" y="356" class="output">◉ <tspan class="bold fg5">z</tspan><tspan class="fg8">zzzzzzz</tspan> <tspan class="fg2">root()</tspan> <tspan class="bold fg4">0</tspan><tspan class="fg8">0000000</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="374" class="output">
|
||||
@ -60,7 +60,7 @@
|
||||
</tspan><tspan xml:space="preserve" x="10" y="410" class="output"><tspan class="fg2"># when we rebase it:</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="428" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="446" class="output">$ jj describe -m "README: say which world"
|
||||
</tspan><tspan xml:space="preserve" x="10" y="464" class="output">Working copy now at: <tspan class="bold fg13">x</tspan><tspan class="bold fg8">kmnkqsr</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">2</tspan><tspan class="bold fg8">0110a7f</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="464" class="output">Working copy now at: <tspan class="bold fg13">n</tspan><tspan class="bold fg8">rtkvytr</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">9</tspan><tspan class="bold fg8">c88f5a5</tspan><tspan class="bold"> </tspan><tspan class="bold fg10">(empty)</tspan><tspan class="bold"> README: say which world</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="482" class="output">Parent commit : <tspan class="bold fg5">o</tspan><tspan class="fg8">rrkosyo</tspan> <tspan class="bold fg4">7</tspan><tspan class="fg8">fd1a60b</tspan> <tspan class="fg5">master</tspan><tspan class="fg8"> | </tspan><tspan class="fg2">(empty)</tspan> Merge pull request #6 fr<tspan class="hard-br" rotate="45" dx=".1em" dy="-.2em">↓</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="500" class="output">om Spaceghost/patch-1
|
||||
</tspan><tspan xml:space="preserve" x="10" y="518" class="output">$ echo "Hello Earth!" > README
|
||||
@ -79,15 +79,15 @@
|
||||
</tspan><tspan xml:space="preserve" x="10" y="752" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="770" class="output">$ jj rebase -d b1
|
||||
</tspan><tspan xml:space="preserve" x="10" y="788" class="output">Rebased 1 commits
|
||||
</tspan><tspan xml:space="preserve" x="10" y="806" class="output">Working copy now at: <tspan class="bold fg13">x</tspan><tspan class="bold fg8">kmnkqsr</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">5</tspan><tspan class="bold fg8">39b71db</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="806" class="output">Working copy now at: <tspan class="bold fg13">n</tspan><tspan class="bold fg8">rtkvytr</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">9</tspan><tspan class="bold fg8">333ce62</tspan><tspan class="bold"> </tspan><tspan class="bold fg9">(conflict)</tspan><tspan class="bold"> README: say which world</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="824" class="output">Parent commit : <tspan class="bold fg5">t</tspan><tspan class="fg8">pstlust</tspan> <tspan class="bold fg4">b1</tspan><tspan class="fg8">b3f972</tspan> <tspan class="fg5">octocat-patch-1</tspan><tspan class="fg8"> | </tspan>sentence case
|
||||
</tspan><tspan xml:space="preserve" x="10" y="842" class="output">Added 0 files, modified 1 files, removed 0 files
|
||||
</tspan><tspan xml:space="preserve" x="10" y="860" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="878" class="output"><tspan class="fg2"># Huh, that seemed to succeed. Let's take a</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="896" class="output"><tspan class="fg2"># look at the repo:</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="914" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="932" class="output">$ jj log -r 'all()'
|
||||
</tspan><tspan xml:space="preserve" x="10" y="950" class="output">@ <tspan class="bold fg13">x</tspan><tspan class="bold fg8">kmnkqsr</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@example.com</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">2023-10-01 22:29:25.000 -07:00</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">5</tspan><tspan class="bold fg8">39b71db</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 fg13">n</tspan><tspan class="bold fg8">rtkvytr</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@example.com</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">2023-10-03 17:52:10.000 -07:00</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">9</tspan><tspan class="bold fg8">333ce62</tspan><tspan class="bold"> </tspan><tspan class="bold fg9">conflict</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="968" class="output">│ <tspan class="bold">README: say which world</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="986" class="output">◉ <tspan class="bold fg5">t</tspan><tspan class="fg8">pstlust</tspan> <tspan class="fg3">support+octocat@github.com</tspan> <tspan class="fg6">2018-05-10 12:55:19.000 -05:00</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1004" class="output">│ <tspan class="fg5">octocat-patch-1</tspan> <tspan class="bold fg4">b1</tspan><tspan class="fg8">b3f972</tspan>
|
||||
@ -96,7 +96,7 @@
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1058" class="output">├─╯ Create CONTRIBUTING.md
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1076" class="output">◉ <tspan class="bold fg5">o</tspan><tspan class="fg8">rrkosyo</tspan> <tspan class="fg3">octocat@nowhere.com</tspan> <tspan class="fg6">2012-03-06 15:06:50.000 -08:00</tspan> <tspan class="fg5">master</tspan> <tspan class="bold fg4">7</tspan><tspan class="fg8">fd1a60b</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1094" class="output">├─╮ <tspan class="fg2">(empty)</tspan> Merge pull request #6 from Spaceghost/patch-1
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1112" class="output">│ ◉ <tspan class="bold fg5">n</tspan><tspan class="fg8">znozkvv</tspan> <tspan class="fg3">Johnneylee.rollins@gmail.com</tspan> <tspan class="fg6">2011-09-13 21:42:41.000 -07:00</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1112" class="output">│ ◉ <tspan class="bold fg5">nz</tspan><tspan class="fg8">nozkvv</tspan> <tspan class="fg3">Johnneylee.rollins@gmail.com</tspan> <tspan class="fg6">2011-09-13 21:42:41.000 -07:00</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1130" class="output">├─╯ <tspan class="bold fg4">76</tspan><tspan class="fg8">294131</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1148" class="output">│ New line at end of file. --Signed off by Spaceghost
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1166" class="output">◉ <tspan class="bold fg5">s</tspan><tspan class="fg8">yktoqts</tspan> <tspan class="fg3">cameron@github.com</tspan> <tspan class="fg6">2011-01-26 11:06:08.000 -08:00</tspan> <tspan class="bold fg4">55</tspan><tspan class="fg8">3c2077</tspan>
|
||||
@ -107,33 +107,32 @@
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1256" class="output"><tspan class="fg6">M README</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1274" class="output"><tspan class="fg1">There are unresolved conflicts at these paths:</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1292" class="output">README <tspan class="fg3">2-sided conflict</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1310" class="output">Working copy : <tspan class="bold fg13">x</tspan><tspan class="bold fg8">kmnkqsr</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">5</tspan><tspan class="bold fg8">39b71db</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="1310" class="output">Working copy : <tspan class="bold fg13">n</tspan><tspan class="bold fg8">rtkvytr</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">9</tspan><tspan class="bold fg8">333ce62</tspan><tspan class="bold"> </tspan><tspan class="bold fg9">(conflict)</tspan><tspan class="bold"> README: say which world</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1328" class="output">Parent commit: <tspan class="bold fg5">t</tspan><tspan class="fg8">pstlust</tspan> <tspan class="bold fg4">b1</tspan><tspan class="fg8">b3f972</tspan> <tspan class="fg5">octocat-patch-1</tspan><tspan class="fg8"> | </tspan>sentence case
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1346" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1364" class="output"><tspan class="fg2"># As you can see, the rebased commit has a</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1382" class="output"><tspan class="fg2"># conflict. The file in the working copy looks</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1400" class="output"><tspan class="fg2"># like this:</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1418" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1436" class="output">$ cat README
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1454" class="output"><<<<<<<
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1472" class="output">%%%%%%%
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1490" class="output">-Hello World!
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1508" class="output">+Hello world!
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1526" class="output">+++++++
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1544" class="output">Hello Earth!
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1562" class="output">>>>>>>>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1580" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1598" class="output"><tspan class="fg2"># Now we will resolve the conflict:</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1616" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1634" class="output">$ echo "Hello earth!" > README
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1652" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1670" class="output"><tspan class="fg2"># The status command no longer reports it:</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1688" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1706" class="output">$ jj status
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1724" class="output">Working copy changes:
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1742" class="output"><tspan class="fg6">M README</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1760" class="output">Working copy : <tspan class="bold fg13">x</tspan><tspan class="bold fg8">kmnkqsr</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">b1c</tspan><tspan class="bold fg8">13c23</tspan><tspan class="bold"> README: say which world</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1778" class="output">Parent commit: <tspan class="bold fg5">t</tspan><tspan class="fg8">pstlust</tspan> <tspan class="bold fg4">b1b</tspan><tspan class="fg8">3f972</tspan> <tspan class="fg5">octocat-patch-1</tspan><tspan class="fg8"> | </tspan>sentence case
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1364" class="output"><tspan class="fg2"># Indeed, the rebased commit has a conflict. The conflicted file</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1382" class="output"><tspan class="fg2"># in the working copy looks like this:</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1400" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1418" class="output">$ cat README
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1436" class="output"><<<<<<<
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1454" class="output">%%%%%%%
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1472" class="output">-Hello World!
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1490" class="output">+Hello world!
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1508" class="output">+++++++
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1526" class="output">Hello Earth!
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1544" class="output">>>>>>>>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1562" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1580" class="output"><tspan class="fg2"># Now we will resolve the conflict:</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1598" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1616" class="output">$ echo "Hello earth!" > README
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1634" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1652" class="output"><tspan class="fg2"># The status command no longer reports it:</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1670" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1688" class="output">$ jj status
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1706" class="output">Working copy changes:
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1724" class="output"><tspan class="fg6">M README</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1742" class="output">Working copy : <tspan class="bold fg13">n</tspan><tspan class="bold fg8">rtkvytr</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">d</tspan><tspan class="bold fg8">b55fbbe</tspan><tspan class="bold"> README: say which world</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1760" class="output">Parent commit: <tspan class="bold fg5">t</tspan><tspan class="fg8">pstlust</tspan> <tspan class="bold fg4">b1</tspan><tspan class="fg8">b3f972</tspan> <tspan class="fg5">octocat-patch-1</tspan><tspan class="fg8"> | </tspan>sentence case
|
||||
</tspan></text>
|
||||
</svg>
|
||||
</svg>
|
||||
|
||||
|
Before Width: | Height: | Size: 17 KiB After Width: | Height: | Size: 17 KiB |
@ -1,5 +1,5 @@
|
||||
<!-- Created with term-transcript v0.3.0 (https://github.com/slowli/term-transcript) -->
|
||||
<svg viewBox="0 0 720 2288" width="720" height="2288" xmlns="http://www.w3.org/2000/svg">
|
||||
<svg viewBox="0 0 720 2234" width="720" height="2234" xmlns="http://www.w3.org/2000/svg">
|
||||
<style>
|
||||
.container {
|
||||
font: 14px Fira Code, Liberation Mono, SFMono-Regular, Consolas, Menlo, monospace;
|
||||
@ -33,134 +33,131 @@
|
||||
.fg15 { fill: #f2f2f2; } .output-bg .fg15 { stroke: #f2f2f2; }
|
||||
</style>
|
||||
<rect width="100%" height="100%" y="0" rx="4.5" style="fill: #0c0c0c;" />
|
||||
<svg x="0" y="10" width="720" height="2268" viewBox="0 0 720 2268">
|
||||
<svg x="0" y="10" width="720" height="2214" viewBox="0 0 720 2214">
|
||||
<g class="input-bg"></g>
|
||||
<text class="container fg7"><tspan xml:space="preserve" x="10" y="14" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="32" class="output"><tspan class="fg2"># We are in the octocat/Hello-World repo.</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="50" class="output"><tspan class="fg2"># We have an empty working copy on top of master:</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="68" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="86" class="output">$ jj status
|
||||
</tspan><tspan xml:space="preserve" x="10" y="104" class="output">The working copy is clean
|
||||
</tspan><tspan xml:space="preserve" x="10" y="122" class="output">Working copy : <tspan class="bold fg13">m</tspan><tspan class="bold fg8">xqlopuw</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">8</tspan><tspan class="bold fg8">d0e7e7c</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="140" 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="158" class="output">ceghost/patch-1
|
||||
</tspan><tspan xml:space="preserve" x="10" y="176" class="output">$ jj log
|
||||
</tspan><tspan xml:space="preserve" x="10" y="194" class="output">@ <tspan class="bold fg13">m</tspan><tspan class="bold fg8">xqlopuw</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@example.com</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">2023-10-01 22:29:26.000 -07:00</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">8</tspan><tspan class="bold fg8">d0e7e7c</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="212" 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="230" class="output">│ ◉ <tspan class="bold fg5">t</tspan><tspan class="fg8">pstlust</tspan> <tspan class="fg3">support+octocat@github.com</tspan> <tspan class="fg6">2018-05-10 12:55:19.000 -05:00</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="248" class="output">├─╯ <tspan class="fg5">octocat-patch-1</tspan> <tspan class="bold fg4">b1</tspan><tspan class="fg8">b3f972</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="266" class="output">│ sentence case
|
||||
</tspan><tspan xml:space="preserve" x="10" y="284" class="output">│ ◉ <tspan class="bold fg5">k</tspan><tspan class="fg8">owxouwz</tspan> <tspan class="fg3">octocat@nowhere.com</tspan> <tspan class="fg6">2014-06-10 15:22:26.000 -07:00</tspan> <tspan class="fg5">test</tspan> <tspan class="bold fg4">b3</tspan><tspan class="fg8">cbd5bb</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="302" class="output">├─╯ Create CONTRIBUTING.md
|
||||
</tspan><tspan xml:space="preserve" x="10" y="320" class="output">◉ <tspan class="bold fg5">o</tspan><tspan class="fg8">rrkosyo</tspan> <tspan class="fg3">octocat@nowhere.com</tspan> <tspan class="fg6">2012-03-06 15:06:50.000 -08:00</tspan> <tspan class="fg5">master</tspan> <tspan class="bold fg4">7</tspan><tspan class="fg8">fd1a60b</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="338" class="output">│ <tspan class="fg2">(empty)</tspan> Merge pull request #6 from Spaceghost/patch-1
|
||||
</tspan><tspan xml:space="preserve" x="10" y="356" class="output">~
|
||||
</tspan><tspan xml:space="preserve" x="10" y="86" class="output">$ jj log
|
||||
</tspan><tspan xml:space="preserve" x="10" y="104" class="output">@ <tspan class="bold fg13">v</tspan><tspan class="bold fg8">qulumvq</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@example.com</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">2023-10-03 17:52:11.000 -07:00</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">5</tspan><tspan class="bold fg8">8432c48</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="122" class="output">│ <tspan class="bold fg10">(empty)</tspan><tspan class="bold"> </tspan><tspan class="bold fg10">(no description set)</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="140" class="output">│ ◉ <tspan class="bold fg5">t</tspan><tspan class="fg8">pstlust</tspan> <tspan class="fg3">support+octocat@github.com</tspan> <tspan class="fg6">2018-05-10 12:55:19.000 -05:00</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="158" class="output">├─╯ <tspan class="fg5">octocat-patch-1</tspan> <tspan class="bold fg4">b1</tspan><tspan class="fg8">b3f972</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="176" class="output">│ sentence case
|
||||
</tspan><tspan xml:space="preserve" x="10" y="194" class="output">│ ◉ <tspan class="bold fg5">k</tspan><tspan class="fg8">owxouwz</tspan> <tspan class="fg3">octocat@nowhere.com</tspan> <tspan class="fg6">2014-06-10 15:22:26.000 -07:00</tspan> <tspan class="fg5">test</tspan> <tspan class="bold fg4">b3</tspan><tspan class="fg8">cbd5bb</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="212" class="output">├─╯ Create CONTRIBUTING.md
|
||||
</tspan><tspan xml:space="preserve" x="10" y="230" class="output">◉ <tspan class="bold fg5">o</tspan><tspan class="fg8">rrkosyo</tspan> <tspan class="fg3">octocat@nowhere.com</tspan> <tspan class="fg6">2012-03-06 15:06:50.000 -08:00</tspan> <tspan class="fg5">master</tspan> <tspan class="bold fg4">7</tspan><tspan class="fg8">fd1a60b</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="248" class="output">│ <tspan class="fg2">(empty)</tspan> Merge pull request #6 from Spaceghost/patch-1
|
||||
</tspan><tspan xml:space="preserve" x="10" y="266" class="output">~
|
||||
</tspan><tspan xml:space="preserve" x="10" y="284" class="output">$ jj status
|
||||
</tspan><tspan xml:space="preserve" x="10" y="302" class="output">The working copy is clean
|
||||
</tspan><tspan xml:space="preserve" x="10" y="320" class="output">Working copy : <tspan class="bold fg13">v</tspan><tspan class="bold fg8">qulumvq</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">5</tspan><tspan class="bold fg8">8432c48</tspan><tspan class="bold"> </tspan><tspan class="bold fg10">(empty)</tspan><tspan class="bold"> </tspan><tspan class="bold fg10">(no description set)</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="338" class="output">Parent commit: <tspan class="bold fg5">o</tspan><tspan class="fg8">rrkosyo</tspan> <tspan class="bold fg4">7</tspan><tspan class="fg8">fd1a60b</tspan> <tspan class="fg5">master</tspan><tspan class="fg8"> | </tspan><tspan class="fg2">(empty)</tspan> Merge pull request #6 from Spa<tspan class="hard-br" rotate="45" dx=".1em" dy="-.2em">↓</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="356" class="output">ceghost/patch-1
|
||||
</tspan><tspan xml:space="preserve" x="10" y="374" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="392" class="output"><tspan class="fg2"># Now make some changes in the working copy:</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="410" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="428" class="output">$ echo "Goodbye World!" > README
|
||||
</tspan><tspan xml:space="preserve" x="10" y="446" class="output">$ echo stuff > new-file
|
||||
</tspan><tspan xml:space="preserve" x="10" y="464" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="482" class="output"><tspan class="fg2"># Our working copy's commit ID changed</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="500" class="output"><tspan class="fg2"># because we made changes:</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="482" class="output"><tspan class="fg2"># Because of these changes, our working copy is no longer marked as "(empty)".</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="500" class="output"><tspan class="fg2"># Also, its commit ID (starting with a blue character) changed:</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="518" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="536" class="output">$ jj status
|
||||
</tspan><tspan xml:space="preserve" x="10" y="554" class="output">Working copy changes:
|
||||
</tspan><tspan xml:space="preserve" x="10" y="572" class="output"><tspan class="fg6">M README</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="590" class="output"><tspan class="fg2">A new-file</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="608" class="output">Working copy : <tspan class="bold fg13">m</tspan><tspan class="bold fg8">xqlopuw</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">b5</tspan><tspan class="bold fg8">80fc4d</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">(no description set)</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="608" class="output">Working copy : <tspan class="bold fg13">v</tspan><tspan class="bold fg8">qulumvq</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">2</tspan><tspan class="bold fg8">5610674</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">(no description set)</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="626" class="output">Parent commit: <tspan class="bold fg5">o</tspan><tspan class="fg8">rrkosyo</tspan> <tspan class="bold fg4">7</tspan><tspan class="fg8">fd1a60b</tspan> <tspan class="fg5">master</tspan><tspan class="fg8"> | </tspan><tspan class="fg2">(empty)</tspan> Merge pull request #6 from Spa<tspan class="hard-br" rotate="45" dx=".1em" dy="-.2em">↓</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="644" class="output">ceghost/patch-1
|
||||
</tspan><tspan xml:space="preserve" x="10" y="662" class="output">$ jj log
|
||||
</tspan><tspan xml:space="preserve" x="10" y="680" class="output">@ <tspan class="bold fg13">m</tspan><tspan class="bold fg8">xqlopuw</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@example.com</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">2023-10-01 22:29:27.000 -07:00</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">b5</tspan><tspan class="bold fg8">80fc4d</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="698" class="output">│ <tspan class="bold fg3">(no description set)</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="716" class="output">│ ◉ <tspan class="bold fg5">t</tspan><tspan class="fg8">pstlust</tspan> <tspan class="fg3">support+octocat@github.com</tspan> <tspan class="fg6">2018-05-10 12:55:19.000 -05:00</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="734" class="output">├─╯ <tspan class="fg5">octocat-patch-1</tspan> <tspan class="bold fg4">b1</tspan><tspan class="fg8">b3f972</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="752" class="output">│ sentence case
|
||||
</tspan><tspan xml:space="preserve" x="10" y="770" class="output">│ ◉ <tspan class="bold fg5">k</tspan><tspan class="fg8">owxouwz</tspan> <tspan class="fg3">octocat@nowhere.com</tspan> <tspan class="fg6">2014-06-10 15:22:26.000 -07:00</tspan> <tspan class="fg5">test</tspan> <tspan class="bold fg4">b3</tspan><tspan class="fg8">cbd5bb</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="788" class="output">├─╯ Create CONTRIBUTING.md
|
||||
</tspan><tspan xml:space="preserve" x="10" y="806" class="output">◉ <tspan class="bold fg5">o</tspan><tspan class="fg8">rrkosyo</tspan> <tspan class="fg3">octocat@nowhere.com</tspan> <tspan class="fg6">2012-03-06 15:06:50.000 -08:00</tspan> <tspan class="fg5">master</tspan> <tspan class="bold fg4">7</tspan><tspan class="fg8">fd1a60b</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="824" class="output">│ <tspan class="fg2">(empty)</tspan> Merge pull request #6 from Spaceghost/patch-1
|
||||
</tspan><tspan xml:space="preserve" x="10" y="842" 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"># Add a branch so we can easily refer to this</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="896" class="output"><tspan class="fg2"># commit:</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="914" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="932" class="output">$ jj branch create goodbye
|
||||
</tspan><tspan xml:space="preserve" x="10" y="950" class="output">$ jj log
|
||||
</tspan><tspan xml:space="preserve" x="10" y="968" class="output">@ <tspan class="bold fg13">m</tspan><tspan class="bold fg8">xqlopuw</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@example.com</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">2023-10-01 22:29:27.000 -07:00</tspan><tspan class="bold"> </tspan><tspan class="bold fg13">goodbye</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">b5</tspan><tspan class="bold fg8">80fc4d</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="986" class="output">│ <tspan class="bold fg3">(no description set)</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1004" class="output">│ ◉ <tspan class="bold fg5">t</tspan><tspan class="fg8">pstlust</tspan> <tspan class="fg3">support+octocat@github.com</tspan> <tspan class="fg6">2018-05-10 12:55:19.000 -05:00</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1022" class="output">├─╯ <tspan class="fg5">octocat-patch-1</tspan> <tspan class="bold fg4">b1</tspan><tspan class="fg8">b3f972</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1040" class="output">│ sentence case
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1058" class="output">│ ◉ <tspan class="bold fg5">k</tspan><tspan class="fg8">owxouwz</tspan> <tspan class="fg3">octocat@nowhere.com</tspan> <tspan class="fg6">2014-06-10 15:22:26.000 -07:00</tspan> <tspan class="fg5">test</tspan> <tspan class="bold fg4">b3</tspan><tspan class="fg8">cbd5bb</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1076" class="output">├─╯ Create CONTRIBUTING.md
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1094" class="output">◉ <tspan class="bold fg5">o</tspan><tspan class="fg8">rrkosyo</tspan> <tspan class="fg3">octocat@nowhere.com</tspan> <tspan class="fg6">2012-03-06 15:06:50.000 -08:00</tspan> <tspan class="fg5">master</tspan> <tspan class="bold fg4">7</tspan><tspan class="fg8">fd1a60b</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1112" class="output">│ <tspan class="fg2">(empty)</tspan> Merge pull request #6 from Spaceghost/patch-1
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1130" class="output">~
|
||||
</tspan><tspan xml:space="preserve" x="10" y="662" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="680" class="output"><tspan class="fg2"># Add a branch so we can easily refer to this</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="698" class="output"><tspan class="fg2"># commit:</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="716" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="734" class="output">$ jj branch create goodbye
|
||||
</tspan><tspan xml:space="preserve" x="10" y="752" class="output">$ jj log
|
||||
</tspan><tspan xml:space="preserve" x="10" y="770" class="output">@ <tspan class="bold fg13">v</tspan><tspan class="bold fg8">qulumvq</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@example.com</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">2023-10-03 17:52:11.000 -07:00</tspan><tspan class="bold"> </tspan><tspan class="bold fg13">goodbye</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">2</tspan><tspan class="bold fg8">5610674</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="788" class="output">│ <tspan class="bold fg3">(no description set)</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="806" class="output">│ ◉ <tspan class="bold fg5">t</tspan><tspan class="fg8">pstlust</tspan> <tspan class="fg3">support+octocat@github.com</tspan> <tspan class="fg6">2018-05-10 12:55:19.000 -05:00</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="824" class="output">├─╯ <tspan class="fg5">octocat-patch-1</tspan> <tspan class="bold fg4">b1</tspan><tspan class="fg8">b3f972</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="842" class="output">│ sentence case
|
||||
</tspan><tspan xml:space="preserve" x="10" y="860" class="output">│ ◉ <tspan class="bold fg5">k</tspan><tspan class="fg8">owxouwz</tspan> <tspan class="fg3">octocat@nowhere.com</tspan> <tspan class="fg6">2014-06-10 15:22:26.000 -07:00</tspan> <tspan class="fg5">test</tspan> <tspan class="bold fg4">b3</tspan><tspan class="fg8">cbd5bb</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="878" class="output">├─╯ Create CONTRIBUTING.md
|
||||
</tspan><tspan xml:space="preserve" x="10" y="896" class="output">◉ <tspan class="bold fg5">o</tspan><tspan class="fg8">rrkosyo</tspan> <tspan class="fg3">octocat@nowhere.com</tspan> <tspan class="fg6">2012-03-06 15:06:50.000 -08:00</tspan> <tspan class="fg5">master</tspan> <tspan class="bold fg4">7</tspan><tspan class="fg8">fd1a60b</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="914" class="output">│ <tspan class="fg2">(empty)</tspan> Merge pull request #6 from Spaceghost/patch-1
|
||||
</tspan><tspan xml:space="preserve" x="10" y="932" class="output">~
|
||||
</tspan><tspan xml:space="preserve" x="10" y="950" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="968" class="output"><tspan class="fg2"># Start working on a new change off of master:</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="986" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1004" class="output">$ jj co master
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1022" class="output">Working copy now at: <tspan class="bold fg13">tq</tspan><tspan class="bold fg8">wqmnqp</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">e</tspan><tspan class="bold fg8">5047385</tspan><tspan class="bold"> </tspan><tspan class="bold fg10">(empty)</tspan><tspan class="bold"> </tspan><tspan class="bold fg10">(no description set)</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1040" class="output">Parent commit : <tspan class="bold fg5">o</tspan><tspan class="fg8">rrkosyo</tspan> <tspan class="bold fg4">7</tspan><tspan class="fg8">fd1a60b</tspan> <tspan class="fg5">master</tspan><tspan class="fg8"> | </tspan><tspan class="fg2">(empty)</tspan> Merge pull request #6 fr<tspan class="hard-br" rotate="45" dx=".1em" dy="-.2em">↓</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1058" class="output">om Spaceghost/patch-1
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1076" class="output">Added 0 files, modified 1 files, removed 1 files
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1094" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1112" class="output"><tspan class="fg2"># Note that we were told the working copy is now empty (AKA clean). The</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1130" class="output"><tspan class="fg2"># "goodbye" change stayed in its own commit:</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1148" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1166" class="output"><tspan class="fg2"># Start working on a new change off of master:</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1184" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1202" class="output">$ jj co master
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1220" class="output">Working copy now at: <tspan class="bold fg13">q</tspan><tspan class="bold fg8">uqqqrtm</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">c</tspan><tspan class="bold fg8">b2e4d75</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="1238" 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="1256" class="output">om Spaceghost/patch-1
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1274" class="output">Added 0 files, modified 1 files, removed 1 files
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1292" class="output">$ jj log
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1310" class="output">@ <tspan class="bold fg13">q</tspan><tspan class="bold fg8">uqqqrtm</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@example.com</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">2023-10-01 22:29:27.000 -07:00</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">c</tspan><tspan class="bold fg8">b2e4d75</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1328" 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="1346" class="output">│ ◉ <tspan class="bold fg5">m</tspan><tspan class="fg8">xqlopuw</tspan> <tspan class="fg3">jjfan@example.com</tspan> <tspan class="fg6">2023-10-01 22:29:27.000 -07:00</tspan> <tspan class="fg5">goodbye</tspan> <tspan class="bold fg4">b5</tspan><tspan class="fg8">80fc4d</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1364" class="output">├─╯ <tspan class="fg3">(no description set)</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1382" class="output">│ ◉ <tspan class="bold fg5">t</tspan><tspan class="fg8">pstlust</tspan> <tspan class="fg3">support+octocat@github.com</tspan> <tspan class="fg6">2018-05-10 12:55:19.000 -05:00</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1400" class="output">├─╯ <tspan class="fg5">octocat-patch-1</tspan> <tspan class="bold fg4">b1</tspan><tspan class="fg8">b3f972</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1418" class="output">│ sentence case
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1436" class="output">│ ◉ <tspan class="bold fg5">k</tspan><tspan class="fg8">owxouwz</tspan> <tspan class="fg3">octocat@nowhere.com</tspan> <tspan class="fg6">2014-06-10 15:22:26.000 -07:00</tspan> <tspan class="fg5">test</tspan> <tspan class="bold fg4">b3</tspan><tspan class="fg8">cbd5bb</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1454" class="output">├─╯ Create CONTRIBUTING.md
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1472" class="output">◉ <tspan class="bold fg5">o</tspan><tspan class="fg8">rrkosyo</tspan> <tspan class="fg3">octocat@nowhere.com</tspan> <tspan class="fg6">2012-03-06 15:06:50.000 -08:00</tspan> <tspan class="fg5">master</tspan> <tspan class="bold fg4">7</tspan><tspan class="fg8">fd1a60b</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1490" class="output">│ <tspan class="fg2">(empty)</tspan> Merge pull request #6 from Spaceghost/patch-1
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1508" 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"># Note that the working copy is now clean; the</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1562" class="output"><tspan class="fg2"># "goodbye" change stayed in its own commit:</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1580" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1598" class="output">$ jj status
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1616" class="output">The working copy is clean
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1634" class="output">Working copy : <tspan class="bold fg13">q</tspan><tspan class="bold fg8">uqqqrtm</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">c</tspan><tspan class="bold fg8">b2e4d75</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="1652" 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="1670" class="output">ceghost/patch-1
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1688" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1706" class="output"><tspan class="fg2"># Modify a file in this new change:</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1724" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1742" class="output">$ echo "Hello everyone!" > README
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1760" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1778" class="output"><tspan class="fg2"># The working copy is not special; we can, for</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1796" class="output"><tspan class="fg2"># example, set the description of any commit.</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1814" class="output"><tspan class="fg2"># First, set it on the working copy:</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1832" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1850" class="output">$ jj describe -m everyone
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1868" class="output">Working copy now at: <tspan class="bold fg13">q</tspan><tspan class="bold fg8">uqqqrtm</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">5</tspan><tspan class="bold fg8">0e8e102</tspan><tspan class="bold"> everyone</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1886" 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="1904" class="output">om Spaceghost/patch-1
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1922" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1940" class="output"><tspan class="fg2"># Now set it on the change we worked on before:</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1958" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1976" class="output">$ jj describe goodbye -m goodbye
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1994" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="2012" class="output"><tspan class="fg2"># Inspect the result:</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="2030" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="2048" class="output">$ jj log
|
||||
</tspan><tspan xml:space="preserve" x="10" y="2066" class="output">◉ <tspan class="bold fg5">m</tspan><tspan class="fg8">xqlopuw</tspan> <tspan class="fg3">jjfan@example.com</tspan> <tspan class="fg6">2023-10-01 22:29:27.000 -07:00</tspan> <tspan class="fg5">goodbye</tspan> <tspan class="bold fg4">b19</tspan><tspan class="fg8">dd123</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="2084" class="output">│ goodbye
|
||||
</tspan><tspan xml:space="preserve" x="10" y="2102" class="output">│ @ <tspan class="bold fg13">q</tspan><tspan class="bold fg8">uqqqrtm</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@example.com</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">2023-10-01 22:29:27.000 -07:00</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">5</tspan><tspan class="bold fg8">0e8e102</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="2120" class="output">├─╯ <tspan class="bold">everyone</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="2138" class="output">│ ◉ <tspan class="bold fg5">t</tspan><tspan class="fg8">pstlust</tspan> <tspan class="fg3">support+octocat@github.com</tspan> <tspan class="fg6">2018-05-10 12:55:19.000 -05:00</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="2156" class="output">├─╯ <tspan class="fg5">octocat-patch-1</tspan> <tspan class="bold fg4">b1b</tspan><tspan class="fg8">3f972</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="2174" class="output">│ sentence case
|
||||
</tspan><tspan xml:space="preserve" x="10" y="2192" class="output">│ ◉ <tspan class="bold fg5">k</tspan><tspan class="fg8">owxouwz</tspan> <tspan class="fg3">octocat@nowhere.com</tspan> <tspan class="fg6">2014-06-10 15:22:26.000 -07:00</tspan> <tspan class="fg5">test</tspan> <tspan class="bold fg4">b3</tspan><tspan class="fg8">cbd5bb</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="2210" class="output">├─╯ Create CONTRIBUTING.md
|
||||
</tspan><tspan xml:space="preserve" x="10" y="2228" class="output">◉ <tspan class="bold fg5">o</tspan><tspan class="fg8">rrkosyo</tspan> <tspan class="fg3">octocat@nowhere.com</tspan> <tspan class="fg6">2012-03-06 15:06:50.000 -08:00</tspan> <tspan class="fg5">master</tspan> <tspan class="bold fg4">7</tspan><tspan class="fg8">fd1a60b</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="2246" class="output">│ <tspan class="fg2">(empty)</tspan> Merge pull request #6 from Spaceghost/patch-1
|
||||
</tspan><tspan xml:space="preserve" x="10" y="2264" class="output">~
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1166" class="output">$ jj log
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1184" class="output">@ <tspan class="bold fg13">tq</tspan><tspan class="bold fg8">wqmnqp</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@example.com</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">2023-10-03 17:52:10.000 -07:00</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">e</tspan><tspan class="bold fg8">5047385</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1202" class="output">│ <tspan class="bold fg10">(empty)</tspan><tspan class="bold"> </tspan><tspan class="bold fg10">(no description set)</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1220" class="output">│ ◉ <tspan class="bold fg5">v</tspan><tspan class="fg8">qulumvq</tspan> <tspan class="fg3">jjfan@example.com</tspan> <tspan class="fg6">2023-10-03 17:52:11.000 -07:00</tspan> <tspan class="fg5">goodbye</tspan> <tspan class="bold fg4">2</tspan><tspan class="fg8">5610674</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1238" class="output">├─╯ <tspan class="fg3">(no description set)</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1256" class="output">│ ◉ <tspan class="bold fg5">tp</tspan><tspan class="fg8">stlust</tspan> <tspan class="fg3">support+octocat@github.com</tspan> <tspan class="fg6">2018-05-10 12:55:19.000 -05:00</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1274" class="output">├─╯ <tspan class="fg5">octocat-patch-1</tspan> <tspan class="bold fg4">b1</tspan><tspan class="fg8">b3f972</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1292" class="output">│ sentence case
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1310" class="output">│ ◉ <tspan class="bold fg5">k</tspan><tspan class="fg8">owxouwz</tspan> <tspan class="fg3">octocat@nowhere.com</tspan> <tspan class="fg6">2014-06-10 15:22:26.000 -07:00</tspan> <tspan class="fg5">test</tspan> <tspan class="bold fg4">b3</tspan><tspan class="fg8">cbd5bb</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1328" class="output">├─╯ Create CONTRIBUTING.md
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1346" class="output">◉ <tspan class="bold fg5">o</tspan><tspan class="fg8">rrkosyo</tspan> <tspan class="fg3">octocat@nowhere.com</tspan> <tspan class="fg6">2012-03-06 15:06:50.000 -08:00</tspan> <tspan class="fg5">master</tspan> <tspan class="bold fg4">7</tspan><tspan class="fg8">fd1a60b</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1364" class="output">│ <tspan class="fg2">(empty)</tspan> Merge pull request #6 from Spaceghost/patch-1
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1382" class="output">~
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1400" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1418" class="output"><tspan class="fg2"># Let's do a sanity check: 'jj status' should tell us that</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1436" class="output"><tspan class="fg2"># the working copy is clean.</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1454" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1472" class="output">$ jj status
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1490" class="output">The working copy is clean
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1508" class="output">Working copy : <tspan class="bold fg13">tq</tspan><tspan class="bold fg8">wqmnqp</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">e</tspan><tspan class="bold fg8">5047385</tspan><tspan class="bold"> </tspan><tspan class="bold fg10">(empty)</tspan><tspan class="bold"> </tspan><tspan class="bold fg10">(no description set)</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1526" class="output">Parent commit: <tspan class="bold fg5">o</tspan><tspan class="fg8">rrkosyo</tspan> <tspan class="bold fg4">7</tspan><tspan class="fg8">fd1a60b</tspan> <tspan class="fg5">master</tspan><tspan class="fg8"> | </tspan><tspan class="fg2">(empty)</tspan> Merge pull request #6 from Spa<tspan class="hard-br" rotate="45" dx=".1em" dy="-.2em">↓</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1544" class="output">ceghost/patch-1
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1562" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1580" class="output"><tspan class="fg2"># Modify a file in this new change:</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1598" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1616" class="output">$ echo "Hello everyone!" > README
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1634" class="output">$ jj status
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1652" class="output">Working copy changes:
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1670" class="output"><tspan class="fg6">M README</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1688" class="output">Working copy : <tspan class="bold fg13">tq</tspan><tspan class="bold fg8">wqmnqp</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">e</tspan><tspan class="bold fg8">2f75adb</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">(no description set)</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1706" class="output">Parent commit: <tspan class="bold fg5">o</tspan><tspan class="fg8">rrkosyo</tspan> <tspan class="bold fg4">7</tspan><tspan class="fg8">fd1a60b</tspan> <tspan class="fg5">master</tspan><tspan class="fg8"> | </tspan><tspan class="fg2">(empty)</tspan> Merge pull request #6 from Spa<tspan class="hard-br" rotate="45" dx=".1em" dy="-.2em">↓</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1724" class="output">ceghost/patch-1
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1742" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1760" class="output"><tspan class="fg2"># The working copy is not special; we can, for</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1778" class="output"><tspan class="fg2"># example, set the description of any commit.</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1796" class="output"><tspan class="fg2"># First, set it on the working copy:</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1814" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1832" class="output">$ jj describe -m everyone
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1850" class="output"><tspan class="fg8">... (output redacted) ...</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1868" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1886" class="output"><tspan class="fg2"># Now set it on the change we worked on before:</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1904" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1922" class="output">$ jj describe goodbye -m goodbye
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1940" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1958" class="output"><tspan class="fg2"># Inspect the result:</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1976" class="output">
|
||||
</tspan><tspan xml:space="preserve" x="10" y="1994" class="output">$ jj log
|
||||
</tspan><tspan xml:space="preserve" x="10" y="2012" class="output">◉ <tspan class="bold fg5">v</tspan><tspan class="fg8">qulumvq</tspan> <tspan class="fg3">jjfan@example.com</tspan> <tspan class="fg6">2023-10-03 17:52:11.000 -07:00</tspan> <tspan class="fg5">goodbye</tspan> <tspan class="bold fg4">a</tspan><tspan class="fg8">cfe0ad3</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="2030" class="output">│ goodbye
|
||||
</tspan><tspan xml:space="preserve" x="10" y="2048" class="output">│ @ <tspan class="bold fg13">tq</tspan><tspan class="bold fg8">wqmnqp</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@example.com</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">2023-10-03 17:52:11.000 -07:00</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">7d</tspan><tspan class="bold fg8">1af3d0</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="2066" class="output">├─╯ <tspan class="bold">everyone</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="2084" class="output">│ ◉ <tspan class="bold fg5">tp</tspan><tspan class="fg8">stlust</tspan> <tspan class="fg3">support+octocat@github.com</tspan> <tspan class="fg6">2018-05-10 12:55:19.000 -05:00</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="2102" class="output">├─╯ <tspan class="fg5">octocat-patch-1</tspan> <tspan class="bold fg4">b1</tspan><tspan class="fg8">b3f972</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="2120" class="output">│ sentence case
|
||||
</tspan><tspan xml:space="preserve" x="10" y="2138" class="output">│ ◉ <tspan class="bold fg5">k</tspan><tspan class="fg8">owxouwz</tspan> <tspan class="fg3">octocat@nowhere.com</tspan> <tspan class="fg6">2014-06-10 15:22:26.000 -07:00</tspan> <tspan class="fg5">test</tspan> <tspan class="bold fg4">b3</tspan><tspan class="fg8">cbd5bb</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="2156" class="output">├─╯ Create CONTRIBUTING.md
|
||||
</tspan><tspan xml:space="preserve" x="10" y="2174" class="output">◉ <tspan class="bold fg5">o</tspan><tspan class="fg8">rrkosyo</tspan> <tspan class="fg3">octocat@nowhere.com</tspan> <tspan class="fg6">2012-03-06 15:06:50.000 -08:00</tspan> <tspan class="fg5">master</tspan> <tspan class="bold fg4">7f</tspan><tspan class="fg8">d1a60b</tspan>
|
||||
</tspan><tspan xml:space="preserve" x="10" y="2192" class="output">│ <tspan class="fg2">(empty)</tspan> Merge pull request #6 from Spaceghost/patch-1
|
||||
</tspan><tspan xml:space="preserve" x="10" y="2210" class="output">~
|
||||
</tspan></text>
|
||||
</svg>
|
||||
</svg>
|
||||
|
||||
|
Before Width: | Height: | Size: 23 KiB After Width: | Height: | Size: 22 KiB |
Loading…
Reference in New Issue
Block a user