mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-02-08 21:48:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 17

docs: don't hide demos in collapsed regions in the README

Browse source
This commit is contained in:
Martin von Zweigbergk 2021-10-27 15:07:46 -07:00
parent 04e54b093d
commit 3c6a922b97
1 changed files with 4 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
README.md
View file

@ -29,12 +29,9 @@ Features:
The commits you create will look like regular Git commits. You can always
switch back to Git.
<details>
<summary>Demo</summary>
<a href="https://asciinema.org/a/C5TKUes95yHCiGvtzkisDNGsz" target="_blank">
<img src="https://asciinema.org/a/C5TKUes95yHCiGvtzkisDNGsz.svg" />
<img src="https://asciinema.org/a/C5TKUes95yHCiGvtzkisDNGsz.svg" />
</a>
</details>
* **The working copy is automatically committed**
@ -45,12 +42,9 @@ Features:
changes (you can even check out a different commit while resolving merge
conflicts).
<details>
<summary>Demo</summary>
<a href="https://asciinema.org/a/AYSGSp4A8hNjBlN3kgv1Pl4F7" target="_blank">
<img src="https://asciinema.org/a/AYSGSp4A8hNjBlN3kgv1Pl4F7.svg" />
<img src="https://asciinema.org/a/AYSGSp4A8hNjBlN3kgv1Pl4F7.svg" />
</a>
</details>
* **Operations update the repo first, then possibly the working copy**
@ -65,12 +59,9 @@ Features:
an earlier repo state, or to simply undo a particular operation (which does
not necessarily have to be the most recent operation).
<details>
<summary>Demo</summary>
<a href="https://asciinema.org/a/udkBsxop3q29IK6LjgrjwlfcA" target="_blank">
<img src="https://asciinema.org/a/udkBsxop3q29IK6LjgrjwlfcA.svg" />
<img src="https://asciinema.org/a/udkBsxop3q29IK6LjgrjwlfcA.svg" />
</a>
</details>
* **Conflicts can be recorded in commits**
@ -82,12 +73,9 @@ Features:
This design also lets Jujutsu rebase merge commits correctly (unlike both Git
and Mercurial).
<details>
<summary>Demo</summary>
<a href="https://asciinema.org/a/mrx3HrirDdB5FjJIOa6ketwFm" target="_blank">
<img src="https://asciinema.org/a/mrx3HrirDdB5FjJIOa6ketwFm.svg" />
<img src="https://asciinema.org/a/mrx3HrirDdB5FjJIOa6ketwFm.svg" />
</a>
</details>
* **Automatic rebase**