mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2024-12-27 06:27:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

demos: clarify command for finding operation to undo

Browse source 
The command grepped for 'o ' and picked the third line. That was meant
to match the graph nodes only, but it also matched the 'jj co master'
line. Let's match only 'o' at the beginning of the line, and throw in
another space for good measure (since that's what we get from the new
default graph style from Sapling).
This commit is contained in:
Martin von Zweigbergk 2023-03-12 22:31:40 -07:00 committed by Martin von Zweigbergk
parent 74ffe7f688
commit cb86efac61
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
demos/demo_operation_log.sh
View file

@ -30,7 +30,7 @@ is:"
run_command "jj op log --color=always | head" run_command "jj op log --color=always | head"
comment "Let's undo that rebase operation:" comment "Let's undo that rebase operation:"
rebase_op=$(jj --color=never op log | grep 'o ' | sed '3q;d' | cut -b4-15) rebase_op=$(jj --color=never op log | grep '^o ' | sed '2q;d' | cut -b4-15)
run_command "jj undo $rebase_op" run_command "jj undo $rebase_op"
comment "Note that only the rebase was undone, and the comment "Note that only the rebase was undone, and the