1
0
Fork 0
mirror of https://github.com/tldr-pages/tldr.git synced 2025-07-02 01:15:23 +02:00

jj: add new pages for jj (Jujutsu)

This commit is contained in:
Agam Agarwal 2025-06-26 22:14:42 +05:30
parent a138d21f1c
commit 7c60f86660
4 changed files with 80 additions and 0 deletions

View file

@ -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}}`

20
pages/common/jj-rebase.md Normal file
View file

@ -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}}`

View file

@ -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`

24
pages/common/jj-split.md Normal file
View file

@ -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]}}`