diff --git a/pages/common/jj-diff.md b/pages/common/jj-diff.md new file mode 100644 index 0000000000..f11d167f16 --- /dev/null +++ b/pages/common/jj-diff.md @@ -0,0 +1,24 @@ +# jj diff + +> Compare file contents between two revisions. +> More information: . + +- Show changes of current revision: + +`jj diff` + +- Show changes of given revsets (e.g. `B::D`, `A..D`, `B|C|D`, etc.): + +`jj diff {{[-r|--revisions]}} {{revsets}}` + +- Show changes from given revision to given revision: + +`jj diff {{[-f|--from]}} {{from_revset}} {{[-t|--to]}} {{to_revset}}` + +- Show diff statistics: + +`jj diff --stat` + +- Show a Git-format diff: + +`jj diff --git` diff --git a/pages/common/jj-log.md b/pages/common/jj-log.md new file mode 100644 index 0000000000..00466411ad --- /dev/null +++ b/pages/common/jj-log.md @@ -0,0 +1,16 @@ +# jj log + +> Show revision history as a graph. +> More information: . + +- Show revision history as a graph: + +`jj log` + +- Show only given revsets (e.g. `B::D`, `A..D`, `B|C|D`, etc.): + +`jj log {{[-r|--revisions]}} {{revsets}}` + +- Show log with a particular template for each line (e.g. 5 characters of commit hash and author): + +`jj log {{[-T|--template]}} 'commit_id.shortest(5) ++ " " ++ author'` diff --git a/pages/common/jj-status.md b/pages/common/jj-status.md new file mode 100644 index 0000000000..982b8650d2 --- /dev/null +++ b/pages/common/jj-status.md @@ -0,0 +1,9 @@ +# jj status + +> Show high-level repository status. +> This includes the working copy commit and its parents, and a summary of the changes in the working copy and any existing conflicts in the working copy. +> More information: . + +- Show high-level status of the repository: + +`jj status` diff --git a/pages/common/jj.md b/pages/common/jj.md new file mode 100644 index 0000000000..6dd82cac2f --- /dev/null +++ b/pages/common/jj.md @@ -0,0 +1,29 @@ +# jj + +> Jujutsu, a version control system. +> Some subcommands such as `log`, `desc`, `new`, `git`, etc. have their own usage documentation. +> More information: . + +- Update description of the revisions specified by given revsets (e.g. `B::D`, `A..D`, `B|C|D`, etc.): + +`jj describe {{[-r|--revision]}} {{revsets}}` + +- Create a new commit/revision on top of a given revision : + +`jj new {{revset}}` + +- Create a new merge commit on top of multiple revisions: + +`jj new {{revset1 revset2 ...}}` + +- Execute a jj subcommand without snapshotting the working copy: + +`jj --ignore-working-copy {{subcommand}}` + +- Execute a jj subcommand at an operation: + +`jj {{[--at-op|--at-operation]}} {{operation}} {{subcommand}}` + +- Display help for a specific subcommand (like `new`, `commit`, `desc`, etc.): + +`jj help {{subcommand}}`