NameLast commit messageLast commit date
..
demo_git_compat.shtemplates: create new git_format_patch_email_headers template1 year ago
demo_juggle_conflicts.shjj debug init-local: fixup, docs1 year ago
demo_operation_log.shdemos: update, replace `branch` with `bookmark`2 years ago
demo_resolve_conflicts.shdemos: update, replace `branch` with `bookmark`2 years ago
demo_working_copy.shdemos: update, replace `branch` with `bookmark`2 years ago
git_compat.pngdemos: update, replace `branch` with `bookmark`2 years ago
git_compat.svgdemos: update, replace `branch` with `bookmark`2 years ago
helpers.shdemos: fixup, working_copy.png wasn't regenerated properly2 years ago
juggle_conflicts.pngdemos: update, replace `branch` with `bookmark`2 years ago
juggle_conflicts.svgdemos: update, replace `branch` with `bookmark`2 years ago
operation_log.pngdemos: update, replace `branch` with `bookmark`2 years ago
operation_log.svgdemos: update, replace `branch` with `bookmark`2 years ago
README.mddemos: add demos/README.md and run scripts to generate SVGs3 years ago
resolve_conflicts.pngdemos: update, replace `branch` with `bookmark`2 years ago
resolve_conflicts.svgdemos: update, replace `branch` with `bookmark`2 years ago
run_scripts.shdemos/run_script.sh: fix ImageMagick invocation2 years ago
setup_standard_config.shdemos: make `jj` perform the line wrapping instead of `term-transcript`3 years ago
working_copy.pngdemos: update, replace `branch` with `bookmark`2 years ago
working_copy.svgdemos: update, replace `branch` with `bookmark`2 years ago
README.md

Screenshots with demos and scripts to generate them

The demo_*.sh scripts in this directory demo various features of jj.

The run_scripts.sh script can be used to:

  • Run them inside a standardized environment instead of the user's local environment.
  • Generate SVG and PNG images for the scripts.

The PNG images in the repo may be slightly older, as they take up more space in the repo.

The SVG images have human-readable diffs, but may look different on different computers with different fonts installed.

Running run_scripts.sh

This requires ImageMagick and term-transcript-cli to be installed. See run_scripts.sh's error messages for some more details. On Debian Linux, it also seems helpful to sudo apt install inkscape; ImageMagick seems to use either Inkscape itself or some dependency of it.

One way to make all the images and check the output is:

cd demos
./run_scripts.sh demo_*.sh |less

A note on fonts

The exact PNG output depends on the fonts you have installed on your system.

The screenshots are usually generated on a Debian Linux system and use the "Fira Code" font. It can be installed with sudo apt install fonts-firacode. It seems to include all relevant Unicode symbols and be a little bolder and thus more readable than the "Liberation Mono" font, which is used if Fira Code is not installed. That font also works OK. See the CSS font specification in run_scripts.sh for other fonts tried (especially when viewing SVGs on the web). If none apply, the default monospace font will be used.

convert -list Fonts will list the fonts ImageMagick is aware of.