From a8619a922f3057fb210371fd1be5de7c66edbf40 Mon Sep 17 00:00:00 2001 From: Agam Agarwal Date: Sat, 5 Jul 2025 20:15:41 +0530 Subject: [PATCH] jj-{absorb, evolog, restore}: add pages (#17129) * jj-evolog: add page * jj-absorb: add page * jj-restore: add page * Fix typo in jj-restore --------- Co-authored-by: Wiktor Perskawiec --- pages/common/jj-absorb.md | 12 ++++++++++++ pages/common/jj-evolog.md | 16 ++++++++++++++++ pages/common/jj-restore.md | 16 ++++++++++++++++ 3 files changed, 44 insertions(+) create mode 100644 pages/common/jj-absorb.md create mode 100644 pages/common/jj-evolog.md create mode 100644 pages/common/jj-restore.md diff --git a/pages/common/jj-absorb.md b/pages/common/jj-absorb.md new file mode 100644 index 0000000000..9fad7bd6ed --- /dev/null +++ b/pages/common/jj-absorb.md @@ -0,0 +1,12 @@ +# jj absorb + +> Split changes in the source revision and move each change to the closest mutable ancestor where the corresponding lines were modified last. +> More information: . + +- Move all changes from a revision to other revisions automatically: + +`jj absorb {{[-f|--from]}} {{revset}} {{[-t|--into]}} {{revsets}}` + +- Move only changes in given files from a revision to other revisions: + +`jj absorb {{[-f|--from]}} {{revset}} {{[-t|--into]}} {{revsets}} {{filesets}}` diff --git a/pages/common/jj-evolog.md b/pages/common/jj-evolog.md new file mode 100644 index 0000000000..c7d8462db9 --- /dev/null +++ b/pages/common/jj-evolog.md @@ -0,0 +1,16 @@ +# jj evolog + +> Show how a change has evolved over time, listing the previous commits it has pointed to. +> More information: . + +- Show how a revision has evolved over time: + +`jj evolog {{[-r|--revision]}} {{revset}}` + +- Show diff statistics in the evolution log: + +`jj evolog {{[-r|--revision]}} {{revset}} --stat` + +- Show summary of each change in the evolution log: + +`jj evolog {{[-r|--revision]}} {{revset}} {{[-s|--summary]}}` diff --git a/pages/common/jj-restore.md b/pages/common/jj-restore.md new file mode 100644 index 0000000000..9fdcb6dba2 --- /dev/null +++ b/pages/common/jj-restore.md @@ -0,0 +1,16 @@ +# jj restore + +> Restore files from another revision. +> More information: . + +- Restore files from a revision into another revision: + +`jj restore {{[-f|--from]}} {{revset}} {{[-t|--into]}} {{revset}} {{filesets}}` + +- Undo the changes in a revision as compared to the merge of its parents: + +`jj restore {{[-c|--changes-in]}} {{revset}} {{filesets}}` + +- Interactively choose what parts to restore: + +`jj restore {{[-f|--from]}} {{revset}} {{[-t|--into]}} {{revset}} {{[-i|--interactive]}}`