-
-
Notifications
You must be signed in to change notification settings - Fork 4.6k
jj-{commit, describe, edit, new, squash}: add pages #17047
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
+81
−0
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
6b28e60
jj: add basic commit creation and editing pages for jj (Jujutsu)
AgamAgarwal dec4285
Apply requested changes from review
AgamAgarwal d511465
Add long form of `jj describe` along with the short `jj desc`.
AgamAgarwal 7d40d2c
Make first character of note upper case
AgamAgarwal File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
# jj commit | ||
|
||
> Update the description and create a new change on top. | ||
> More information: <https://jj-vcs.github.io/jj/latest/cli-reference/#jj-commit>. | ||
|
||
- 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]}}` |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
# jj describe | ||
|
||
> Update the change description or other metadata. | ||
> More information: <https://jj-vcs.github.io/jj/latest/cli-reference/#jj-describe>. | ||
|
||
- 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}}` |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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: <https://jj-vcs.github.io/jj/latest/cli-reference/#jj-edit>. | ||
- Set the given revision as the working copy: | ||
|
||
`jj edit {{revset}}` |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
# jj new | ||
|
||
> Create a new empty change. | ||
> More information: <https://jj-vcs.github.io/jj/latest/cli-reference/#jj-new>. | ||
|
||
- 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}}` |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
# jj squash | ||
|
||
> Move changes from a revision into another revision. | ||
> More information: <https://jj-vcs.github.io/jj/latest/cli-reference/#jj-squash>. | ||
|
||
- 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]}}` |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.