diff --git a/pages/common/jj-operation-log.md b/pages/common/jj-operation-log.md deleted file mode 100644 index 0653076c8d..0000000000 --- a/pages/common/jj-operation-log.md +++ /dev/null @@ -1,10 +0,0 @@ -# jj operation log - -> View log of operations of this `jj` repository as a graph. -> Operation ID copied from here can be passed to other commands to run them at that operation. -> They can also be passed to `jj operation restore` to restore the repository to that state. -> More information: . - -- Show operation log: - -`jj {{[op|operation]}} log` diff --git a/pages/common/jj-operation-restore.md b/pages/common/jj-operation-restore.md deleted file mode 100644 index 077ccd1049..0000000000 --- a/pages/common/jj-operation-restore.md +++ /dev/null @@ -1,9 +0,0 @@ -# jj operation restore - -> Restore the repository to an earlier state. -> `jj operation log` can be used to find the operation ID to be passed here. -> More information: . - -- Restore the repository to its state at the given operation: - -`jj {{[op|operation]}} restore {{operation}}` diff --git a/pages/common/jj-operation-show.md b/pages/common/jj-operation-show.md deleted file mode 100644 index b25c4d8a67..0000000000 --- a/pages/common/jj-operation-show.md +++ /dev/null @@ -1,12 +0,0 @@ -# jj operation show - -> Show changes to the repository in an operation. -> More information: . - -- Show changes in an operation: - -`jj {{[op|operation]}} show {{operation}}` - -- Show stat, summary and patch of modifications of an operation: - -`jj {{[op|operation]}} show {{--stat}} {{[-s|--summary]}} {{[-p|--patch]}} {{operation}}` diff --git a/pages/common/jj-operation-undo.md b/pages/common/jj-operation-undo.md deleted file mode 100644 index efbf273426..0000000000 --- a/pages/common/jj-operation-undo.md +++ /dev/null @@ -1,12 +0,0 @@ -# jj operation undo - -> Create a new operation that undoes an earlier operation. -> More information: . - -- Undo the last operation: - -`jj {{[op|operation]}} undo` - -- Undo the given operation: - -`jj {{[op|operation]}} undo {{operation}}` diff --git a/pages/common/jj-operation.md b/pages/common/jj-operation.md new file mode 100644 index 0000000000..f4bb5ab9f7 --- /dev/null +++ b/pages/common/jj-operation.md @@ -0,0 +1,28 @@ +# jj operation + +> Work with the operation log of a `jj` repository. +> More information: . + +- Show operation log: + +`jj {{[op|operation]}} log` + +- Undo the last operation: + +`jj {{[op|operation]}} undo` + +- Undo a given operation: + +`jj {{[op|operation]}} undo {{operation}}` + +- Restore the repository to its state at a given operation: + +`jj {{[op|operation]}} restore {{operation}}` + +- Show changes to the repository in an operation: + +`jj {{[op|operation]}} show {{operation}}` + +- Show stat, summary and patch of modifications of an operation: + +`jj {{[op|operation]}} show {{--stat}} {{[-s|--summary]}} {{[-p|--patch]}} {{operation}}`