diff --git a/demos/demo_operation_log.sh b/demos/demo_operation_log.sh index 9d1ffb9c7..da9024aaa 100755 --- a/demos/demo_operation_log.sh +++ b/demos/demo_operation_log.sh @@ -12,13 +12,8 @@ so far:" run_command "jj op log" comment "We are going to make some changes to show -how the operation log works. -We are currently working off of the \"master\" -branch:" -run_command "jj log" - -comment "Let's add a file, set a description, and -rebase onto the \"test\" branch:" +how the operation log works. Let's add a file, set +a description, and rebase onto the \"test\" branch:" run_command "echo stuff > new-file" run_command "jj describe -m stuff" run_command "jj rebase -d test" @@ -30,10 +25,11 @@ run_command "jj describe -m \"other stuff\"" comment "The repo now looks like this:" run_command "jj log" -run_command "# And the operation log looks like this:" +comment "And the operation log looks like this:" +run_command "jj op log --color=always | head" comment "Let's undo that rebase operation:" -rebase_op=$(jj --color=never op log | grep 'o ' | sed '3q;d' | cut -b3-15) +rebase_op=$(jj --color=never op log | grep 'o ' | sed '3q;d' | cut -b4-15) run_command "jj undo $rebase_op" comment "The \"stuff\" change is now back on master as diff --git a/demos/git_compat.png b/demos/git_compat.png index ef59f7fc2..c523ec1ac 100644 Binary files a/demos/git_compat.png and b/demos/git_compat.png differ diff --git a/demos/juggle_conflicts.png b/demos/juggle_conflicts.png index 2b6c470e0..b2d7ccb0e 100644 Binary files a/demos/juggle_conflicts.png and b/demos/juggle_conflicts.png differ diff --git a/demos/operation_log.png b/demos/operation_log.png index 3b629bca7..fac0252a8 100644 Binary files a/demos/operation_log.png and b/demos/operation_log.png differ diff --git a/demos/resolve_conflicts.png b/demos/resolve_conflicts.png index d964f7ca9..289424aeb 100644 Binary files a/demos/resolve_conflicts.png and b/demos/resolve_conflicts.png differ diff --git a/demos/working_copy.png b/demos/working_copy.png index a4d039b1a..e0744bc35 100644 Binary files a/demos/working_copy.png and b/demos/working_copy.png differ