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: . + +- 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: . + +- 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..c7fea25007 --- /dev/null +++ b/pages/common/jj-resolve.md @@ -0,0 +1,28 @@ +# jj resolve + +> Resolve conflicted files with an external merge tool. +> More information: . + +- 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: . + +- 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]}}`