martinvonz/jj
1
1
Fork 0
mirror of https://github.com/martinvonz/jj.git synced 2024-09-11 13:56:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

demos: redirect setup commands to /dev/null

Browse Source 
Previously, we needed to remove this manually from screenshots.
This commit is contained in:
Ilya Grigoriev 2023-08-28 22:59:58 -07:00
parent 438a4564b0
commit 68b8069c5e
4 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
demos/demo_juggle_conflicts.sh
View File

@ -3,16 +3,18 @@ set -euo pipefail
. "$(dirname "$0")"/helpers.sh . "$(dirname "$0")"/helpers.sh
new_tmp_dir new_tmp_dir
jj init --config-toml ui.allow-init-native=true (
echo "first" > file jj init --config-toml ui.allow-init-native=true
jj branch create first echo "first" > file
jj commit -m 'first' jj branch create first
echo "second" > file jj commit -m 'first'
jj branch create second echo "second" > file
jj commit -m 'second' jj branch create second
echo "third" > file jj commit -m 'second'
jj branch create third echo "third" > file
jj commit -m 'third' jj branch create third
jj commit -m 'third'
) >/dev/null
comment "We are in a repo with three commits, all comment "We are in a repo with three commits, all
editing the same line:" editing the same line:"

2
demos/demo_operation_log.sh
View File

@ -3,7 +3,7 @@ set -euo pipefail
. "$(dirname "$0")"/helpers.sh . "$(dirname "$0")"/helpers.sh
new_tmp_dir new_tmp_dir
jj git clone https://github.com/octocat/Hello-World jj git clone https://github.com/octocat/Hello-World > /dev/null
cd Hello-World cd Hello-World
comment "We are in the octocat/Hello-World repo. comment "We are in the octocat/Hello-World repo.

2
demos/demo_resolve_conflicts.sh
View File

@ -3,7 +3,7 @@ set -euo pipefail
. "$(dirname "$0")"/helpers.sh . "$(dirname "$0")"/helpers.sh
new_tmp_dir new_tmp_dir
jj git clone https://github.com/octocat/Hello-World jj git clone https://github.com/octocat/Hello-World > /dev/null
cd Hello-World cd Hello-World
comment "We are on the master branch of the comment "We are on the master branch of the

2
demos/demo_working_copy.sh
View File

@ -3,7 +3,7 @@ set -euo pipefail
. "$(dirname "$0")"/helpers.sh . "$(dirname "$0")"/helpers.sh
new_tmp_dir new_tmp_dir
jj git clone https://github.com/octocat/Hello-World jj git clone https://github.com/octocat/Hello-World > /dev/null
cd Hello-World cd Hello-World
comment "We are in the octocat/Hello-World repo. comment "We are in the octocat/Hello-World repo.