Yuya Nishihara
abf48576ea
cli: replace --config-toml=TOML with --config=NAME=VALUE
2024-12-17 20:12:12 +09:00
Ilya Grigoriev
5dab5e1ce6
demos: update, replace branch with bookmark
...
The replacement is not purely mechanical, some text is also adjusted to
talk about bookmarks.
2024-10-14 19:49:14 -07:00
Ilya Grigoriev
d3b0f1b970
demos: redact one of the conflict outputs
...
I would prefer to shorten it instead of fully redacting, but I ran into
https://github.com/martinvonz/jj/issues/4239
2024-09-05 17:33:46 -07:00
Ilya Grigoriev
1cc10783a2
demos: update demos as little as possible to regenerate them
...
This updates demos to the point where they can run without
warnings. Some of them become less clear, this is addressed
(where I noticed it) in follow-up commits.
Fixes #3209
2024-09-05 17:33:46 -07:00
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
68b8069c5e
demos: redirect setup commands to /dev/null
...
Previously, we needed to remove this manually from screenshots.
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
Martin von Zweigbergk
73ce048256
demos: add blank line at the end
...
This makes it slightly easier to take a screenshot without getting the
cursor character from the shell input line just below.
2023-02-14 22:12:23 -08:00
Martin von Zweigbergk
f86455a452
demos: allow running without ui.allow-init-native = true
...
We need to use the native backend here because of #27 , but we
shouldn't require the user running the script to have it in their
config.
2022-11-14 00:25:24 -08:00
Martin von Zweigbergk
5a4c463dc0
tests: avoid about-to-be-deleted close command
2022-11-05 06:14:37 -07:00
Martin von Zweigbergk
986fced69e
demos: replace asciinema by screenshots
...
The demos don't need to be animated - the user wouldn't miss anything
if they skipped to the end. So let's just show the full output so the
user can read through it at their own pace. We could use plain text,
but I think the colors are helpful, so I went with screenshots.
Closes #166 .
2022-10-21 06:04:31 -07:00
Martin von Zweigbergk
a15192c05b
docs: update to use new jj branch syntax
2022-06-09 22:24:46 -07:00
Martin von Zweigbergk
798b4bc897
demos: add demo showing how conflicting commits can be rebased etc
2021-11-07 15:17:51 -08:00
