4 Commits

Author	SHA1	Message	Date
Ilya Grigoriev	a70ea9dfdc	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.	2023-10-03 23:52:28 -07:00
Ilya Grigoriev	5e697dc1f3	demos: make jj perform the line wrapping instead of term-transcript ... Previously, `jj` couldn't determine the terminal widths inside demos.	2023-10-03 23:52:28 -07:00
Ilya Grigoriev	eae9e3408d	demos: allow broken pipe when doing jj | head, fix opid ... `jj | head` exits with non-zero code since `head` breaks the pipe. Also, removed `--color=always` from that command as it will shortly become unnecessary. Previosly, this caused the script to stop since it's run with `set -o pipefail`. Also, the operation id recovery code stopped working. We can use `jj debug operation` for this purpose now.	2023-10-03 23:52:28 -07:00
Ilya Grigoriev	438a4564b0	demos: rename demo_helpers.sh and demo_resolve_conflict.sh ... I think it's clearer if only the actual demos started with `demo_`, so I renamed `demo_helpers.sh` to just `helpers.sh`. `demo_resolve_conflict.sh` should match `resolve_conflicts.png` (with an s).	2023-10-03 23:52:28 -07:00