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
Fixing #4239 means the
ordering of some messages have changed.
Invalid
ui.graph.style
configuration is now an error.The builtin template
branch_list
has been renamed tobookmark_list
as partof the
jj branch
deprecation.Deprecations
jj branch
has been deprecated in favor ofjj bookmark
.Rationale: Jujutsu's branches don't behave like Git branches, which a
confused many newcomers, as they expected a similar behavior given the name.
We've renamed them to "bookmarks" to match the actual behavior, as we think
that describes them better, and they also behave similar to Mercurial's
bookmarks.
jj obslog
is now calledjj evolution-log
/jj evolog
.jj obslog
remainsas an alias.
jj unsquash
has been deprecated in favor ofjj squash
andjj diffedit --restore-descendants
.Rationale:
jj squash
can be used in interactive mode to pullchanges from one commit to another, including from a parent commit
to a child commit. For fine-grained dependent diffs, such as when
the parent and the child commits must successively modify the same
location in a file,
jj diffedit --restore-descendants
can be usedto set the parent commit to the desired content without altering the
content of the child commit.
The
git.push-branch-prefix
config has been deprecated in favor ofgit.push-bookmark-prefix
.conflict()
andfile()
revsets have been renamed toconflicts()
andfiles()
respectively. The old names are still around and will be removed in a future
release.
New features
The new config option
snapshot.auto-track
lets you automatically track onlythe specified paths (all paths by default). Use the new
jj file track
command to manually tracks path that were not automatically tracked. There is
no way to list untracked files yet. Use
git status
in a colocated workspaceas a workaround.
#323
jj fix
now allows fixing unchanged files with the--include-unchanged-files
flag. Thiscan be used to more easily introduce automatic formatting changes in a new
commit separate from other changes.
jj workspace add
now accepts a--sparse-patterns=<MODE>
option, whichallows control of the sparse patterns for a newly created workspace:
copy
(inherit from parent; default),
full
(full working copy), orempty
(theempty working copy).
New command
jj workspace rename
that can rename the current workspace.jj op log
gained an option to include operation diffs.jj git clone
now accepts a--remote <REMOTE NAME>
option, whichallows to set a name for the remote instead of using the default
origin
.jj op undo
now reports information on the operation that has been undone.jj squash
: the-k
flag can be used as a shorthand for--keep-emptied
.CommitId / ChangeId template types now support
.normal_hex()
.jj commit
andjj describe
now accept--author
option allowing to quickly changeauthor of given commit.
jj diffedit
,jj abandon
, andjj restore
now accept a--restore-descendants
flag. When used, descendants of the edited or deleted commits will keep their original
content.
jj git fetch -b <remote-git-branch-name>
will now warn if the branch(es)can not be found in any of the specified/configured remotes.
jj split
now lets the user select all changes in interactive mode. This may be usedto keeping all changes into the first commit while keeping the current commit
description for the second commit (the newly created empty one).
Author and committer names are now yellow by default.
Fixed bugs
Update working copy before reporting changes. This prevents errors during reporting
from leaving the working copy in a stale state.
Fixed panic when parsing invalid conflict markers of a particular form.
(#2611)
Editing a hidden commit now makes it visible.
The
present()
revset now suppresses missing working copy error. For example,present(@)
evaluates tonone()
if the current workspace has noworking-copy commit.
Contributors
Thanks to the people who made this release happen!