mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-02-01 00:50:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

changelog: warning on jj git fetch is a new feature, not a bugfix

Browse source
This commit is contained in:
Samuel Tardieu 2024-09-26 18:10:16 +02:00
parent bd82ab3018
commit 07c7d89f85
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
CHANGELOG.md
View file

@ -88,14 +88,14 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
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.
### Fixed bugs
* Update working copy before reporting changes. This prevents errors during reporting
from leaving the working copy in a stale state.
* `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.
* Fixed panic when parsing invalid conflict markers of a particular form.
([#2611](https://github.com/martinvonz/jj/pull/2611))