mirror of
https://github.com/martinvonz/jj.git
synced 2024-09-11 13:56:29 +03:00
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).
This commit is contained in:
parent
2218143968
commit
438a4564b0
@ -1,6 +1,6 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
. "$(dirname "$0")"/demo_helpers.sh
|
. "$(dirname "$0")"/helpers.sh
|
||||||
|
|
||||||
new_tmp_dir
|
new_tmp_dir
|
||||||
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
. "$(dirname "$0")"/demo_helpers.sh
|
. "$(dirname "$0")"/helpers.sh
|
||||||
|
|
||||||
new_tmp_dir
|
new_tmp_dir
|
||||||
jj init --config-toml ui.allow-init-native=true
|
jj init --config-toml ui.allow-init-native=true
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
. "$(dirname "$0")"/demo_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
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
. "$(dirname "$0")"/demo_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
|
@ -1,6 +1,6 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
. "$(dirname "$0")"/demo_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
|
||||||
|
Loading…
Reference in New Issue
Block a user