diff --git a/pages/common/jj-abandon.md b/pages/common/jj-abandon.md new file mode 100644 index 0000000000..2b59b7c9d9 --- /dev/null +++ b/pages/common/jj-abandon.md @@ -0,0 +1,17 @@ +# jj abandon + +> Abandon a revision, rebasing descendants onto its parent(s). +> Abandoning a revision removes its associated change ID. +> More information: . + +- Abandon revisions specified by given revsets (e.g. `B::D`, `A..D`, `B|C|D`, etc.): + +`jj abandon {{revsets}}` + +- Abandon revisions, without deleting their bookmarks and moving them to the parent revisions instead: + +`jj abandon --retain-bookmarks {{revsets}}` + +- Abandon revisions, without modifying the contents of their children: + +`jj abandon --restore-descendants {{revsets}}` diff --git a/pages/common/jj-revert.md b/pages/common/jj-revert.md new file mode 100644 index 0000000000..b3e72e8f8a --- /dev/null +++ b/pages/common/jj-revert.md @@ -0,0 +1,16 @@ +# jj revert + +> Apply the reverse of the given revision(s). +> More information: . + +- Apply the reverse of the revisions specified by the given revsets (e.g. `B::D`, `A..D`, `B|C|D`, etc.): + +`jj revert {{[-r|--revisions]}} {{revsets}}` + +- Apply the reverse on top of specified revisions: + +`jj revert {{[-r|--revisions]}} {{revsets}} {{[-d|--destination]}} {{revsets}}` + +- Apply the reverse before and/or after specified revisions: + +`jj revert {{[-r|--revisions]}} {{revsets}} {{[-B|--insert-before]}} {{revsets}} {{[-A|--insert-after]}} {{revsets}}` diff --git a/pages/common/jj-show.md b/pages/common/jj-show.md new file mode 100644 index 0000000000..21b24e97ba --- /dev/null +++ b/pages/common/jj-show.md @@ -0,0 +1,16 @@ +# jj show + +> Show commit description and changes in a revision. +> More information: . + +- Show commit description and changes in a revision: + +`jj show {{revset}}` + +- Show a summary of changes in a revision: + +`jj show {{[-s|--summary]}} {{revset}}` + +- Show a histogram of changes in a revision: + +`jj show --stat {{revset}}` diff --git a/pages/common/jj-simplify-parents.md b/pages/common/jj-simplify-parents.md new file mode 100644 index 0000000000..abb8173139 --- /dev/null +++ b/pages/common/jj-simplify-parents.md @@ -0,0 +1,13 @@ +# jj simplify-parents + +> Simplify parent edges for the specified revision(s). +> For example, "A -> B -> C | A -> C" gets simplified to "A -> B -> C". +> More information: . + +- Simplify parent edges of given revisions: + +`jj simplify-parents {{[-r|--revisions]}} {{revsets}}` + +- Simplify parent edges of given revisions and trees of their descendants: + +`jj simplify-parents {{[-s|--source]}} {{revsets}}`