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.
Created by
brew bump
Created with
brew bump-formula-pr
.release notes
jj checkout
andjj merge
are both deprecated; usejj new
instead toreplace both of these commands in all instances.
Rationale:
jj checkout
andjj merge
both implement identicalfunctionality, which is a subset of
jj new
.checkout
creates a new workingcopy commit on top of a single specified revision, i.e. with one parent.
merge
creates a new working copy commit on top of at least two specifiedrevisions, i.e. with two or more parents.
The only difference between these commands and
jj new
, which also createsa new working copy commit, is that
new
can create a working copy commit ontop of any arbitrary number of revisions, so it can handle both the previous
cases at once. The only actual difference between these three commands is the
command syntax and their name. These names were chosen to be familiar to users
of other version control systems, but we instead encourage all users to adopt
jj new
instead; it is more general and easier to remember than both ofthese.
jj checkout
andjj merge
will no longer be shown as part ofjj help
, butwill still function for now, emitting a warning about their deprecation.
Deadline:
jj checkout
andjj merge
will be deleted and are expectedbecome a hard error later in 2024.
jj init --git
andjj init --git-repo
are now deprecated and will be removedin the near future.
Use
jj git init
instead.Breaking changes
(Minor) Diff summaries (e.g.
jj diff -s
) now useD
for "Deleted" insteadof
R
for "Removed". @joyously pointed out thatR
could also mean"Renamed".
jj util completion
now takes the shell as a positional argument, not a flag.the previous behavior is deprecated, but supported for now. it will be removed
in the future.
New features
jj util completion
now supports powershell and elvish.Official binaries for macOS running on Apple Silicon (
aarch64-apple-darwin
)are now available, alongside the existing macOS x86 binaries.
New
jj op abandon
command is added to clean up the operation history. Gitrefs and commit objects can be further compacted by
jj util gc
.jj util gc
now removes unreachable operation, view, and Git objects.jj branch rename
will now warn if the renamed branch has a remote branch, sincethose will have to be manually renamed outside of
jj
.jj git push
gained a--tracked
option, to push all the tracked branches.There's now a virtual root operation, similar to the virtual root
commit. It appears at the end of
jj op log
.jj config list
gained a--include-overridden
option to allowprinting overridden config values.
jj config list
now accepts--user
or--repo
option to specifyconfig origin.
New
jj config path
command to print the config file path without launchingan editor.
jj tag list
command prints imported git tags.jj next
andjj prev
now prompt in the event of the next/previous commitbeing ambiguous, instead of failing outright.
jj resolve
now displays the file being resolved.jj workspace root
was aliased tojj root
, for ease of discoverabilityjj diff
no longer shows the contents of binary files.jj git
now has aninit
command that initializes a git backed repo.New template function
surround(prefix, suffix, content)
is added.Fixed bugs
Fixed snapshots of symlinks in
gitignore
-d directory.#2878
Fixed data loss in dirty working copy when checked-out branch is rebased or
abandoned by Git.
#2876
Contributors
Thanks to the people who made this release happen!