From 7c60f8666048c04d21f79dd859875cbaaf386fd4 Mon Sep 17 00:00:00 2001
From: Agam Agarwal <agammaster@gmail.com>
Date: Thu, 26 Jun 2025 22:14:42 +0530
Subject: [PATCH 1/2] jj: add new pages for jj (Jujutsu)

---
 pages/common/jj-parallelize.md |  8 ++++++++
 pages/common/jj-rebase.md      | 20 ++++++++++++++++++++
 pages/common/jj-resolve.md     | 28 ++++++++++++++++++++++++++++
 pages/common/jj-split.md       | 24 ++++++++++++++++++++++++
 4 files changed, 80 insertions(+)
 create mode 100644 pages/common/jj-parallelize.md
 create mode 100644 pages/common/jj-rebase.md
 create mode 100644 pages/common/jj-resolve.md
 create mode 100644 pages/common/jj-split.md

diff --git a/pages/common/jj-parallelize.md b/pages/common/jj-parallelize.md
new file mode 100644
index 0000000000..cb5ea7c598
--- /dev/null
+++ b/pages/common/jj-parallelize.md
@@ -0,0 +1,8 @@
+# jj parallelize
+
+> Parallelize revisions by making them siblings.
+> More information: <https://jj-vcs.github.io/jj/latest/cli-reference/#jj-parallelize>.
+
+- Parallelize given revisions:
+
+`jj parallelize {{revsets}}`
diff --git a/pages/common/jj-rebase.md b/pages/common/jj-rebase.md
new file mode 100644
index 0000000000..1593156484
--- /dev/null
+++ b/pages/common/jj-rebase.md
@@ -0,0 +1,20 @@
+# jj rebase
+
+> Move revisions to different parent(s).
+> More information: <https://jj-vcs.github.io/jj/latest/cli-reference/#jj-rebase>.
+
+- Move given revisions to a different parent(s):
+
+`jj rebase {{[-r|--revisions]}} {{revset}} {{[-d|--destination]}} {{revset}}`
+
+- Move given revisions and all their descendants:
+
+`jj rebase {{[-s|--source]}} {{revset}} {{[-d|--destination]}} {{revset}}`
+
+- Move all revisions in the branch containing given revisions:
+
+`jj rebase {{[-b|--branch]}} {{revset}} {{[-d|--destination]}} {{revset}}`
+
+- Move revisions to before and/or after other revisions:
+
+`jj rebase {{[-r|--revisions]}} {{revset}} {{[-B|--insert-before]}} {{revset}} {{[-A|--insert-after]}} {{revset}}`
diff --git a/pages/common/jj-resolve.md b/pages/common/jj-resolve.md
new file mode 100644
index 0000000000..42a5485a19
--- /dev/null
+++ b/pages/common/jj-resolve.md
@@ -0,0 +1,28 @@
+# jj resolve
+
+> Resolve conflicted files with an external merge tool.
+> More information: <https://jj-vcs.github.io/jj/latest/cli-reference/#jj-resolve>.
+
+- Resolve all conflicts:
+
+`jj resolve`
+
+- List all conflicts:
+
+`jj resolve {{[-l|--list]}}`
+
+- Resolve conflicts in a given revision:
+
+`jj resolve {{[-r|--revision]}} {{revset}}`
+
+- Resolve conflicts in given files:
+
+`jj resolve {{file1}} {{file2}} ...`
+
+- Resolve accepting the incoming versions:
+
+`jj resolve {{--tool}} :theirs`
+
+- Resolve accepting the outgoing versions:
+
+`jj resolve {{--tool}} :ours`
diff --git a/pages/common/jj-split.md b/pages/common/jj-split.md
new file mode 100644
index 0000000000..25b0b3a71c
--- /dev/null
+++ b/pages/common/jj-split.md
@@ -0,0 +1,24 @@
+# jj split
+
+> Split a revision in two.
+> More information: <https://jj-vcs.github.io/jj/latest/cli-reference/#jj-split>.
+
+- Split the given revision into two interactively, putting the second revision on top of it:
+
+`jj split {{[-r|--revision]}} {{revision}}`
+
+- Split out matching files from the given revision:
+
+`jj split {{[-r|--revision]}} {{revision}} {{fileset}}`
+
+- Split the given revision, putting the second revision on top of given destination(s):
+
+`jj split {{[-r|--revision]}} {{revision}} {{[-d|--destination]}} {{revset}}`
+
+- Split the given revision, putting the second revision before and/or after other revision(s):
+
+`jj split {{[-r|--revision]}} {{revision}} {{[-B|--insert-before]}} {{revset}} {{[-A|--insert-after]}} {{revset}}`
+
+- Split the given revision into two parallel revisions:
+
+`jj split {{[-r|--revision]}} {{revision}} {{[-p|--parallel]}}`

From 9163cb63c03a722289020498870f46d45ad2f1a3 Mon Sep 17 00:00:00 2001
From: Agam Agarwal <agammaster@gmail.com>
Date: Tue, 1 Jul 2025 00:51:42 +0530
Subject: [PATCH 2/2] Apply requested changes from review

---
 pages/common/jj-resolve.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pages/common/jj-resolve.md b/pages/common/jj-resolve.md
index 42a5485a19..c7fea25007 100644
--- a/pages/common/jj-resolve.md
+++ b/pages/common/jj-resolve.md
@@ -17,12 +17,12 @@
 
 - Resolve conflicts in given files:
 
-`jj resolve {{file1}} {{file2}} ...`
+`jj resolve {{file1 file2 ...}}`
 
 - Resolve accepting the incoming versions:
 
-`jj resolve {{--tool}} :theirs`
+`jj resolve --tool :theirs`
 
 - Resolve accepting the outgoing versions:
 
-`jj resolve {{--tool}} :ours`
+`jj resolve --tool :ours`