Skip to content

Commit

Permalink
changelog: warning on jj git fetch is a new feature, not a bugfix
Browse files Browse the repository at this point in the history
  • Loading branch information
samueltardieu committed Sep 26, 2024
1 parent bd82ab3 commit 15fb77f
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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))

Expand Down

0 comments on commit 15fb77f

Please sign in to comment.