mirror of
https://github.com/martinvonz/jj.git
synced 2024-09-11 13:56:29 +03:00
438a4564b0
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).
19 lines
428 B
Bash
Executable File
19 lines
428 B
Bash
Executable File
#!/bin/bash
|
|
set -euo pipefail
|
|
. "$(dirname "$0")"/helpers.sh
|
|
|
|
new_tmp_dir
|
|
|
|
comment "Clone a Git repo:"
|
|
run_command "jj git clone https://github.com/octocat/Hello-World"
|
|
run_command "cd Hello-World"
|
|
|
|
comment "Inspect it:"
|
|
run_command "jj log -r 'all()'"
|
|
run_command "jj diff -r b1"
|
|
|
|
comment "The repo is backed by the actual Git repo:"
|
|
run_command "git --git-dir=.jj/repo/store/git log --graph --all --decorate --oneline"
|
|
|
|
blank
|