Merge branch 'martinvonz:main' into advanceable-branches-split

.github/workflows/build.yml

@@ -2,8 +2,6 @@ name: build
 
 on:
   push:
-    branches:
-      - main
   pull_request:
 
 permissions: read-all

.github/workflows/scorecards.yml

@@ -46,6 +46,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@23acc5c183826b7a8a97bce3cecc52db901f8251
+        uses: github/codeql-action/upload-sarif@b611370bb5703a7efb587f9d136a52ea24c5c38c
         with:
           sarif_file: results.sarif

CHANGELOG.md

@@ -19,10 +19,30 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * `jj fix` now defaults to the broader revset `-s reachable(@, mutable())`
   instead of `-s @`.
 
+* Dropped support for deprecated `jj branch delete`/`forget` `--glob` option.
+
+* `jj branch set` now creates new branch if it doesn't exist. Use `jj branch
+  move` to ensure that the target branch already exists.
+  [#3584](https://github.com/martinvonz/jj/issues/3584)
+
 ### Deprecations
 
+* Replacing `-l` shorthand for `--limit` with `-n` in `jj log`, `jj op log` and `jj obslog`.
+
+* `jj split --siblings` is deprecated in favor of `jj split --parallel` (to
+  match `jj parallelize`).
+
+* `jj file show` replaces `jj cat`.
+
+* `jj file chmod` replaces `jj chmod`.
+
+* `jj file list` replaces `jj files`.
+
 ### New features
 
+* Support background filesystem monitoring via watchman triggers enabled with
+  the `core.watchman.register_snapshot_trigger = true` config.
+
 * Show paths to config files when configuration errors occur
 
 * `jj fix` now supports configuring the default revset for `-s` using the
@@ -31,8 +51,33 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * The `descendants()` revset function now accepts an optional `depth` argument;
   like the `ancestors()` depth argument, it limits the depth of the set.
 
+* Revset/template aliases now support function overloading.
+  [#2966](https://github.com/martinvonz/jj/issues/2966)
+
+* Conflicted files are individually simplified before being materialized.
+
+* `jj file` now groups commands for working with files.
+
+* New command `jj branch move` let you update branches by name pattern or source
+  revision.
+
+* New diff option `jj diff --name-only` allows for easier shell scripting.
+
+* `jj git push -c <arg>` can now accept revsets that resolve to multiple
+  revisions. This means that `jj git push -c xyz -c abc` is now equivalent to
+  `jj git push -c 'all:(xyz | abc)'`.
+
+* `jj prev` and `jj next` have gained a `--conflict` flag which moves you
+  to the next conflict in a child commit.
+
+* New command `jj git remote set-url` that sets the url of a git remote.
+
 ### Fixed bugs
 
+* `jj git push` now ignores immutable commits when checking whether a
+  to-be-pushed commit has conflicts, or has no description / committer / author
+  set. [#3029](https://github.com/martinvonz/jj/issues/3029)
+
 ## [0.18.0] - 2024-06-05
 
 ### Breaking changes
@@ -64,6 +109,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   were global flags and specifying them once would insert the new commit before/
   after all the specified commits.
 
+
 ### Deprecations
 
 * Attempting to alias a built-in command now gives a warning, rather than being