mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2024-12-25 05:29:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

docs: update stale references to -o argument deleted in 8744015f33

Browse source
This commit is contained in:
Martin von Zweigbergk 2022-04-30 21:55:34 -07:00 committed by Martin von Zweigbergk
parent 5893b52fd1
commit 5bad272e90
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
demos/demo_operation_log.sh
View file

@ -47,7 +47,7 @@ expect_prompt
pause 7 pause 7
run_command "" run_command ""
run_command "# Let'\''s undo that rebase operation:" run_command "# Let'\''s undo that rebase operation:"
run_command "jj undo -o $rebase_op" run_command "jj undo $rebase_op"
pause 3 pause 3
run_command "# The \"stuff\" change is now back on master as" run_command "# The \"stuff\" change is now back on master as"
run_command "# expected:" run_command "# expected:"
@ -58,7 +58,7 @@ run_command "# after the rebase operation:"
run_command "jj --at-op $rebase_op log" run_command "jj --at-op $rebase_op log"
pause 5 pause 5
run_command "# Looks nice, let'\''s go back to that point:" run_command "# Looks nice, let'\''s go back to that point:"
run_command "jj op restore -o $rebase_op" run_command "jj op restore $rebase_op"
pause 2 pause 2
run_command "" run_command ""
run_command "# We'\''re now back to before the \"other stuff\"" run_command "# We'\''re now back to before the \"other stuff\""

2
docs/git-comparison.md
View file

@ -290,7 +290,7 @@ parent.
</tr> </tr>
<tr> <tr>
<td>Undo an earlier operation</td> <td>Undo an earlier operation</td>
<td><code>jj [op] undo -o &lt;operation ID&gt;</code> <td><code>jj [op] undo &lt;operation ID&gt;</code>
(<code>jj undo</code> is an alias for <code>jj op undo</code>) (<code>jj undo</code> is an alias for <code>jj op undo</code>)
</td> </td>
<td>Not supported</td> <td>Not supported</td>