diff --git a/pages/common/jj-commit.md b/pages/common/jj-commit.md new file mode 100644 index 00000000000000..d71a3c8dfbd91a --- /dev/null +++ b/pages/common/jj-commit.md @@ -0,0 +1,16 @@ +# jj commit + +> Update the description and create a new change on top. +> More information: . + +- Open editor to write the commit message and then create a new empty commit on top: + +`jj commit` + +- Commit with the given message: + +`jj commit {{[-m|--message]}} "{{message}}"` + +- Interactively choose which changes to include: + +`jj commit {{[-i|--interactive]}}` diff --git a/pages/common/jj-describe.md b/pages/common/jj-describe.md new file mode 100644 index 00000000000000..a89d61135d7f22 --- /dev/null +++ b/pages/common/jj-describe.md @@ -0,0 +1,16 @@ +# jj describe + +> Update the change description or other metadata. +> More information: . + +- Update the description of the current change: + +`jj {{[desc|describe]}}` + +- Update the description of given revsets: + +`jj {{[desc|describe]}} {{revsets}}` + +- Update the description to the given message: + +`jj {{[desc|describe]}} {{[-m|--message]}} {{message}}` diff --git a/pages/common/jj-edit.md b/pages/common/jj-edit.md new file mode 100644 index 00000000000000..00fc9842dce404 --- /dev/null +++ b/pages/common/jj-edit.md @@ -0,0 +1,9 @@ +# jj edit + +> Set the specified revision as the working-copy revision. +> Note: It is generally recommended to instead use `jj new` and `jj squash`. +> More information: . + +- Set the given revision as the working copy: + +`jj edit {{revset}}` diff --git a/pages/common/jj-new.md b/pages/common/jj-new.md new file mode 100644 index 00000000000000..5b761dd43f8c92 --- /dev/null +++ b/pages/common/jj-new.md @@ -0,0 +1,20 @@ +# jj new + +> Create a new empty change. +> More information: . + +- Create a new empty change on top of current revision: + +`jj new` + +- Create a new empty change on top of specific revision: + +`jj new {{revision}}` + +- Create a new merge change on top of multiple revisions: + +`jj new {{revset1 revset2 ...}}` + +- Create a new empty change before and after specified revisions: + +`jj new {{[-B|--insert-before]}} {{revsets}} {{[-A|--insert-after]}} {{revsets}}` diff --git a/pages/common/jj-squash.md b/pages/common/jj-squash.md new file mode 100644 index 00000000000000..b9bc59a5d9a12a --- /dev/null +++ b/pages/common/jj-squash.md @@ -0,0 +1,20 @@ +# jj squash + +> Move changes from a revision into another revision. +> More information: . + +- Move all changes from current revision to its parent: + +`jj squash` + +- Move all changes from given revision to its parent: + +`jj squash {{[-r|--revision]}} {{revset}}` + +- Move all changes from given revision(s) to given other revision: + +`jj squash {{[-f|--from]}} {{revsets}} {{[-t|--into]}} {{revset}}` + +- Interactively choose which parts to squash: + +`jj squash {{[-i|--interactive]}}`