mirror of
https://github.com/martinvonz/jj.git
synced 2024-10-23 15:00:17 +00:00
51c374e917
It is important to mention tracking branches and listing branches. This topic is important now that `jj log` does not show branches `jj git clone` says it fetched by default. The demo has become more about navigating a Git remote, so I reworded the README accordingly, shifting the focus more to "Git remote compatibility" and away from "We include a Git repo". Both are important, but these skills seem important for beginners.
129 lines
16 KiB
XML
129 lines
16 KiB
XML
<!-- Created with term-transcript v0.3.0 (https://github.com/slowli/term-transcript) -->
|
||
<svg viewBox="0 0 720 1604" width="720" height="1604" xmlns="http://www.w3.org/2000/svg">
|
||
<style>
|
||
.container {
|
||
font: 14px Fira Code, Liberation Mono, SFMono-Regular, Consolas, Menlo, monospace;
|
||
line-height: 18px;
|
||
}
|
||
.input,.output,.output-bg {
|
||
white-space: pre;
|
||
}
|
||
.input-bg { fill: #fff; fill-opacity: 0.1; }
|
||
.output-bg { user-select: none; text-rendering: geometricPrecision; stroke-width: 0.1; }
|
||
.bold,.prompt { font-weight: 600; }
|
||
.italic { font-style: italic; }
|
||
.underline { text-decoration: underline; }
|
||
.dimmed { fill-opacity: 0.7; }
|
||
.hard-br { font-size: 16px; fill-opacity: 0.8; user-select: none; }
|
||
.fg0 { fill: #0c0c0c; } .output-bg .fg0 { stroke: #0c0c0c; }
|
||
.fg1 { fill: #c50f1f; } .output-bg .fg1 { stroke: #c50f1f; }
|
||
.fg2 { fill: #13a10e; } .output-bg .fg2 { stroke: #13a10e; }
|
||
.fg3 { fill: #c19c00; } .output-bg .fg3 { stroke: #c19c00; }
|
||
.fg4 { fill: #0037da; } .output-bg .fg4 { stroke: #0037da; }
|
||
.fg5 { fill: #881798; } .output-bg .fg5 { stroke: #881798; }
|
||
.fg6 { fill: #3a96dd; } .output-bg .fg6 { stroke: #3a96dd; }
|
||
.fg7 { fill: #cccccc; } .output-bg .fg7 { stroke: #cccccc; }
|
||
.fg8 { fill: #767676; } .output-bg .fg8 { stroke: #767676; }
|
||
.fg9 { fill: #e74856; } .output-bg .fg9 { stroke: #e74856; }
|
||
.fg10 { fill: #16c60c; } .output-bg .fg10 { stroke: #16c60c; }
|
||
.fg11 { fill: #f9f1a5; } .output-bg .fg11 { stroke: #f9f1a5; }
|
||
.fg12 { fill: #3b78ff; } .output-bg .fg12 { stroke: #3b78ff; }
|
||
.fg13 { fill: #b4009e; } .output-bg .fg13 { stroke: #b4009e; }
|
||
.fg14 { fill: #61d6d6; } .output-bg .fg14 { stroke: #61d6d6; }
|
||
.fg15 { fill: #f2f2f2; } .output-bg .fg15 { stroke: #f2f2f2; }
|
||
</style>
|
||
<rect width="100%" height="100%" y="0" rx="4.5" style="fill: #0c0c0c;" />
|
||
<svg x="0" y="10" width="720" height="1584" viewBox="0 0 720 1584">
|
||
<g class="input-bg"></g>
|
||
<text class="container fg7"><tspan xml:space="preserve" x="10" y="14" class="output">
|
||
</tspan><tspan xml:space="preserve" x="10" y="32" class="output"><tspan class="fg2"># Clone a Git repo:</tspan>
|
||
</tspan><tspan xml:space="preserve" x="10" y="50" class="output">
|
||
</tspan><tspan xml:space="preserve" x="10" y="68" class="output">$ jj git clone https://github.com/octocat/Hello-World
|
||
</tspan><tspan xml:space="preserve" x="10" y="86" class="output">Fetching into new repo in "/private/var/folders/lj/rv4h95_d0mxb9ryztzpz4qph0000g<tspan class="hard-br" rotate="45" dx=".1em" dy="-.2em">↓</tspan>
|
||
</tspan><tspan xml:space="preserve" x="10" y="104" class="output">n/T/tmp.ExrIt6VdYc/Hello-World"
|
||
</tspan><tspan xml:space="preserve" x="10" y="122" class="output">branch: <tspan class="fg5">master@origin </tspan> [new] untracked
|
||
</tspan><tspan xml:space="preserve" x="10" y="140" class="output">branch: <tspan class="fg5">octocat-patch-1@origin</tspan> [new] untracked
|
||
</tspan><tspan xml:space="preserve" x="10" y="158" class="output">branch: <tspan class="fg5">test@origin </tspan> [new] untracked
|
||
</tspan><tspan xml:space="preserve" x="10" y="176" class="output">Setting the revset alias "trunk()" to "master@origin"
|
||
</tspan><tspan xml:space="preserve" x="10" y="194" class="output">Working copy now at: <tspan class="bold fg13">q</tspan><tspan class="bold fg8">yyypuyn</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">5</tspan><tspan class="bold fg8">57a65b9</tspan><tspan class="bold"> </tspan><tspan class="bold fg10">(empty)</tspan><tspan class="bold"> </tspan><tspan class="bold fg10">(no description set)</tspan>
|
||
</tspan><tspan xml:space="preserve" x="10" y="212" class="output">Parent commit : <tspan class="bold fg5">o</tspan><tspan class="fg8">rrkosyo</tspan> <tspan class="bold fg4">7</tspan><tspan class="fg8">fd1a60b</tspan> <tspan class="fg5">master</tspan><tspan class="fg8"> | </tspan><tspan class="fg2">(empty)</tspan> Merge pull request #6 fr<tspan class="hard-br" rotate="45" dx=".1em" dy="-.2em">↓</tspan>
|
||
</tspan><tspan xml:space="preserve" x="10" y="230" class="output">om Spaceghost/patch-1
|
||
</tspan><tspan xml:space="preserve" x="10" y="248" class="output">Added 1 files, modified 0 files, removed 0 files
|
||
</tspan><tspan xml:space="preserve" x="10" y="266" class="output">$ cd Hello-World
|
||
</tspan><tspan xml:space="preserve" x="10" y="284" class="output">
|
||
</tspan><tspan xml:space="preserve" x="10" y="302" class="output">
|
||
</tspan><tspan xml:space="preserve" x="10" y="320" class="output"><tspan class="fg2"># By default, "jj" creates a local master branch tracking the remote master</tspan>
|
||
</tspan><tspan xml:space="preserve" x="10" y="338" class="output"><tspan class="fg2"># branch. The other branches are only available as remote-tracking branches.</tspan>
|
||
</tspan><tspan xml:space="preserve" x="10" y="356" class="output">
|
||
</tspan><tspan xml:space="preserve" x="10" y="374" class="output">$ jj branch list --all
|
||
</tspan><tspan xml:space="preserve" x="10" y="392" class="output"><tspan class="fg5">master</tspan>: <tspan class="bold fg5">o</tspan><tspan class="fg8">rrkosyo</tspan> <tspan class="bold fg4">7</tspan><tspan class="fg8">fd1a60b</tspan> <tspan class="fg2">(empty)</tspan> Merge pull request #6 from Spaceghost/patch-1
|
||
</tspan><tspan xml:space="preserve" x="10" y="410" class="output"> <tspan class="fg5">@origin</tspan>: <tspan class="bold fg5">o</tspan><tspan class="fg8">rrkosyo</tspan> <tspan class="bold fg4">7</tspan><tspan class="fg8">fd1a60b</tspan> <tspan class="fg2">(empty)</tspan> Merge pull request #6 from Spaceghost/patch<tspan class="hard-br" rotate="45" dx=".1em" dy="-.2em">↓</tspan>
|
||
</tspan><tspan xml:space="preserve" x="10" y="428" class="output">-1
|
||
</tspan><tspan xml:space="preserve" x="10" y="446" class="output"><tspan class="fg5">octocat-patch-1@origin</tspan>: <tspan class="bold fg5">t</tspan><tspan class="fg8">pstlust</tspan> <tspan class="bold fg4">b1</tspan><tspan class="fg8">b3f972</tspan> sentence case
|
||
</tspan><tspan xml:space="preserve" x="10" y="464" class="output"><tspan class="fg5">test@origin</tspan>: <tspan class="bold fg5">k</tspan><tspan class="fg8">owxouwz</tspan> <tspan class="bold fg4">b3</tspan><tspan class="fg8">cbd5bb</tspan> Create CONTRIBUTING.md
|
||
</tspan><tspan xml:space="preserve" x="10" y="482" class="output">
|
||
</tspan><tspan xml:space="preserve" x="10" y="500" class="output"><tspan class="fg2"># We can create a local branch tracking one of the remote branches we just</tspan>
|
||
</tspan><tspan xml:space="preserve" x="10" y="518" class="output"><tspan class="fg2"># fetched.</tspan>
|
||
</tspan><tspan xml:space="preserve" x="10" y="536" class="output">
|
||
</tspan><tspan xml:space="preserve" x="10" y="554" class="output">$ jj branch track octocat-patch-1@origin
|
||
</tspan><tspan xml:space="preserve" x="10" y="572" class="output">Started tracking 1 remote branches.
|
||
</tspan><tspan xml:space="preserve" x="10" y="590" class="output">
|
||
</tspan><tspan xml:space="preserve" x="10" y="608" class="output"><tspan class="fg2"># By default, "jj log" excludes untracked remote branches to focus on</tspan>
|
||
</tspan><tspan xml:space="preserve" x="10" y="626" class="output"><tspan class="fg2"># "our" commits.</tspan>
|
||
</tspan><tspan xml:space="preserve" x="10" y="644" class="output">
|
||
</tspan><tspan xml:space="preserve" x="10" y="662" class="output">$ jj log
|
||
</tspan><tspan xml:space="preserve" x="10" y="680" class="output"><tspan class="bold fg2">@</tspan> <tspan class="bold fg13">q</tspan><tspan class="bold fg8">yyypuyn</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@example.com</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">2024-09-04 19:29:24</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">5</tspan><tspan class="bold fg8">57a65b9</tspan>
|
||
</tspan><tspan xml:space="preserve" x="10" y="698" class="output">│ <tspan class="bold fg10">(empty)</tspan><tspan class="bold"> </tspan><tspan class="bold fg10">(no description set)</tspan>
|
||
</tspan><tspan xml:space="preserve" x="10" y="716" class="output">│ ○ <tspan class="bold fg5">t</tspan><tspan class="fg8">pstlust</tspan> <tspan class="fg3">support+octocat@github.com</tspan> <tspan class="fg6">2018-05-10 10:55:19</tspan> <tspan class="fg5">octocat-patch-1</tspan>
|
||
</tspan><tspan xml:space="preserve" x="10" y="734" class="output">├─╯ <tspan class="bold fg4">b</tspan><tspan class="fg8">1b3f972</tspan>
|
||
</tspan><tspan xml:space="preserve" x="10" y="752" class="output">│ sentence case
|
||
</tspan><tspan xml:space="preserve" x="10" y="770" class="output"><tspan class="bold fg14">◆</tspan> <tspan class="bold fg5">o</tspan><tspan class="fg8">rrkosyo</tspan> <tspan class="fg3">octocat@nowhere.com</tspan> <tspan class="fg6">2012-03-06 16:06:50</tspan> <tspan class="fg5">master</tspan> <tspan class="bold fg4">7</tspan><tspan class="fg8">fd1a60b</tspan>
|
||
</tspan><tspan xml:space="preserve" x="10" y="788" class="output">│ <tspan class="fg2">(empty)</tspan> Merge pull request #6 from Spaceghost/patch-1
|
||
</tspan><tspan xml:space="preserve" x="10" y="806" class="output">~
|
||
</tspan><tspan xml:space="preserve" x="10" y="824" class="output">
|
||
</tspan><tspan xml:space="preserve" x="10" y="842" class="output"><tspan class="fg2"># We can also ask "jj" to show all the commits.</tspan>
|
||
</tspan><tspan xml:space="preserve" x="10" y="860" class="output">
|
||
</tspan><tspan xml:space="preserve" x="10" y="878" class="output">$ jj log -r 'all()'
|
||
</tspan><tspan xml:space="preserve" x="10" y="896" class="output"><tspan class="bold fg2">@</tspan> <tspan class="bold fg13">q</tspan><tspan class="bold fg8">yyypuyn</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@example.com</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">2024-09-04 19:29:24</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">5</tspan><tspan class="bold fg8">57a65b9</tspan>
|
||
</tspan><tspan xml:space="preserve" x="10" y="914" class="output">│ <tspan class="bold fg10">(empty)</tspan><tspan class="bold"> </tspan><tspan class="bold fg10">(no description set)</tspan>
|
||
</tspan><tspan xml:space="preserve" x="10" y="932" class="output">│ ○ <tspan class="bold fg5">t</tspan><tspan class="fg8">pstlust</tspan> <tspan class="fg3">support+octocat@github.com</tspan> <tspan class="fg6">2018-05-10 10:55:19</tspan> <tspan class="fg5">octocat-patch-1</tspan>
|
||
</tspan><tspan xml:space="preserve" x="10" y="950" class="output">├─╯ <tspan class="bold fg4">b</tspan><tspan class="fg8">1b3f972</tspan>
|
||
</tspan><tspan xml:space="preserve" x="10" y="968" class="output">│ sentence case
|
||
</tspan><tspan xml:space="preserve" x="10" y="986" class="output">│ <tspan class="bold fg14">◆</tspan> <tspan class="bold fg5">k</tspan><tspan class="fg8">owxouwz</tspan> <tspan class="fg3">octocat@nowhere.com</tspan> <tspan class="fg6">2014-06-10 15:22:26</tspan> <tspan class="fg5">test@origin</tspan> <tspan class="bold fg4">b3</tspan><tspan class="fg8">cbd5bb</tspan>
|
||
</tspan><tspan xml:space="preserve" x="10" y="1004" class="output">├─╯ Create CONTRIBUTING.md
|
||
</tspan><tspan xml:space="preserve" x="10" y="1022" class="output"><tspan class="bold fg14">◆</tspan> <tspan class="bold fg5">o</tspan><tspan class="fg8">rrkosyo</tspan> <tspan class="fg3">octocat@nowhere.com</tspan> <tspan class="fg6">2012-03-06 16:06:50</tspan> <tspan class="fg5">master</tspan> <tspan class="bold fg4">7</tspan><tspan class="fg8">fd1a60b</tspan>
|
||
</tspan><tspan xml:space="preserve" x="10" y="1040" class="output">├─╮ <tspan class="fg2">(empty)</tspan> Merge pull request #6 from Spaceghost/patch-1
|
||
</tspan><tspan xml:space="preserve" x="10" y="1058" class="output">│ <tspan class="bold fg14">◆</tspan> <tspan class="bold fg5">n</tspan><tspan class="fg8">znozkvv</tspan> <tspan class="fg3">Johnneylee.rollins@gmail.com</tspan> <tspan class="fg6">2011-09-13 21:42:41</tspan> <tspan class="bold fg4">76</tspan><tspan class="fg8">294131</tspan>
|
||
</tspan><tspan xml:space="preserve" x="10" y="1076" class="output">├─╯ New line at end of file. --Signed off by Spaceghost
|
||
</tspan><tspan xml:space="preserve" x="10" y="1094" class="output"><tspan class="bold fg14">◆</tspan> <tspan class="bold fg5">s</tspan><tspan class="fg8">yktoqts</tspan> <tspan class="fg3">cameron@github.com</tspan> <tspan class="fg6">2011-01-26 12:06:08</tspan> <tspan class="bold fg4">553</tspan><tspan class="fg8">c2077</tspan>
|
||
</tspan><tspan xml:space="preserve" x="10" y="1112" class="output">│ first commit
|
||
</tspan><tspan xml:space="preserve" x="10" y="1130" class="output"><tspan class="bold fg14">◆</tspan> <tspan class="bold fg5">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="1148" class="output">
|
||
</tspan><tspan xml:space="preserve" x="10" y="1166" class="output"><tspan class="fg2"># We can look at the diffs of commits in the repo</tspan>
|
||
</tspan><tspan xml:space="preserve" x="10" y="1184" class="output">
|
||
</tspan><tspan xml:space="preserve" x="10" y="1202" class="output">$ jj diff -r b1
|
||
</tspan><tspan xml:space="preserve" x="10" y="1220" class="output"><tspan class="fg3">Modified regular file README:</tspan>
|
||
</tspan><tspan xml:space="preserve" x="10" y="1238" class="output"><tspan class="fg1"> 1</tspan> <tspan class="fg2"> 1</tspan>: Hello <tspan class="underline fg1">World</tspan><tspan class="underline fg2">world</tspan>!
|
||
</tspan><tspan xml:space="preserve" x="10" y="1256" class="output">
|
||
</tspan><tspan xml:space="preserve" x="10" y="1274" class="output">$ jj diff -r b3
|
||
</tspan><tspan xml:space="preserve" x="10" y="1292" class="output"><tspan class="fg3">Added regular file CONTRIBUTING.md:</tspan>
|
||
</tspan><tspan xml:space="preserve" x="10" y="1310" class="output"> <tspan class="fg2"> 1</tspan>: <tspan class="underline fg2">## Contributing</tspan>
|
||
</tspan><tspan xml:space="preserve" x="10" y="1328" class="output">
|
||
</tspan><tspan xml:space="preserve" x="10" y="1346" class="output"><tspan class="fg2"># The repo is backed by the actual Git repo:</tspan>
|
||
</tspan><tspan xml:space="preserve" x="10" y="1364" class="output">
|
||
</tspan><tspan xml:space="preserve" x="10" y="1382" class="output">$ git --git-dir=.jj/repo/store/git log --graph --all --decorate --oneline
|
||
</tspan><tspan xml:space="preserve" x="10" y="1400" class="output">* <tspan class="fg3">557a65b</tspan>
|
||
</tspan><tspan xml:space="preserve" x="10" y="1418" class="output"><tspan class="fg1">|</tspan> * <tspan class="fg3">1ccbcd7</tspan>
|
||
</tspan><tspan xml:space="preserve" x="10" y="1436" class="output"><tspan class="fg1">|</tspan> * <tspan class="fg3">b1b3f97</tspan><tspan class="fg3"> (</tspan><tspan class="bold fg1">origin/octocat-patch-1</tspan><tspan class="fg3">)</tspan> sentence case
|
||
</tspan><tspan xml:space="preserve" x="10" y="1454" class="output"><tspan class="fg1">|</tspan><tspan class="fg1">/</tspan>
|
||
</tspan><tspan xml:space="preserve" x="10" y="1472" class="output"><tspan class="fg1">|</tspan> * <tspan class="fg3">b3cbd5b</tspan><tspan class="fg3"> (</tspan><tspan class="bold fg1">origin/test</tspan><tspan class="fg3">)</tspan> Create CONTRIBUTING.md
|
||
</tspan><tspan xml:space="preserve" x="10" y="1490" class="output"><tspan class="fg1">|</tspan><tspan class="fg1">/</tspan>
|
||
</tspan><tspan xml:space="preserve" x="10" y="1508" class="output">* <tspan class="fg3">7fd1a60</tspan><tspan class="fg3"> (</tspan><tspan class="bold fg1">origin/master</tspan><tspan class="fg3">)</tspan> Merge pull request #6 from Spaceghost/patch-1
|
||
</tspan><tspan xml:space="preserve" x="10" y="1526" class="output"><tspan class="fg4">|</tspan><tspan class="fg5">\</tspan>
|
||
</tspan><tspan xml:space="preserve" x="10" y="1544" class="output"><tspan class="fg4">|</tspan> * <tspan class="fg3">7629413</tspan> New line at end of file. --Signed off by Spaceghost
|
||
</tspan><tspan xml:space="preserve" x="10" y="1562" class="output"><tspan class="fg4">|</tspan><tspan class="fg4">/</tspan>
|
||
</tspan><tspan xml:space="preserve" x="10" y="1580" class="output">* <tspan class="fg3">553c207</tspan> first commit
|
||
</tspan></text>
|
||
</svg>
|
||
</svg>
|