diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 52aea9f231..d10f29b013 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -2,8 +2,6 @@ name: build
 
 on:
   push:
-    branches:
-      - main
   pull_request:
 
 permissions: read-all
diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml
index 6eab471ddb..1627bccde7 100644
--- a/.github/workflows/scorecards.yml
+++ b/.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
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ae543a8daa..8cecb229d8 100644
--- a/CHANGELOG.md
+++ b/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
diff --git a/Cargo.lock b/Cargo.lock
index 4e0c50902f..a15525ddde 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4,9 +4,9 @@ version = 3
 
 [[package]]
 name = "addr2line"
-version = "0.21.0"
+version = "0.22.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb"
+checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678"
 dependencies = [
  "gimli",
 ]
@@ -40,9 +40,9 @@ dependencies = [
 
 [[package]]
 name = "allocator-api2"
-version = "0.2.16"
+version = "0.2.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5"
+checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f"
 
 [[package]]
 name = "android-tzdata"
@@ -67,47 +67,48 @@ checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299"
 
 [[package]]
 name = "anstream"
-version = "0.6.13"
+version = "0.6.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb"
+checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b"
 dependencies = [
  "anstyle",
  "anstyle-parse",
  "anstyle-query",
  "anstyle-wincon",
  "colorchoice",
+ "is_terminal_polyfill",
  "utf8parse",
 ]
 
 [[package]]
 name = "anstyle"
-version = "1.0.6"
+version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc"
+checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b"
 
 [[package]]
 name = "anstyle-parse"
-version = "0.2.3"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c"
+checksum = "c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4"
 dependencies = [
  "utf8parse",
 ]
 
 [[package]]
 name = "anstyle-query"
-version = "1.0.2"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648"
+checksum = "ad186efb764318d35165f1758e7dcef3b10628e26d41a44bc5550652e6804391"
 dependencies = [
  "windows-sys 0.52.0",
 ]
 
 [[package]]
 name = "anstyle-wincon"
-version = "3.0.2"
+version = "3.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7"
+checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19"
 dependencies = [
  "anstyle",
  "windows-sys 0.52.0",
@@ -165,9 +166,9 @@ dependencies = [
 
 [[package]]
 name = "autocfg"
-version = "1.1.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "backoff"
@@ -182,9 +183,9 @@ dependencies = [
 
 [[package]]
 name = "backtrace"
-version = "0.3.71"
+version = "0.3.73"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d"
+checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a"
 dependencies = [
  "addr2line",
  "cc",
@@ -232,15 +233,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706"
 dependencies = [
  "memchr",
- "regex-automata 0.4.6",
+ "regex-automata 0.4.7",
  "serde",
 ]
 
 [[package]]
 name = "bumpalo"
-version = "3.15.4"
+version = "3.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ff69b9dd49fd426c69a0db9fc04dd934cdb6645ff000864d98f7e2af8830eaa"
+checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
 
 [[package]]
 name = "byteorder"
@@ -248,16 +249,6 @@ version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
-[[package]]
-name = "bytes"
-version = "0.4.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "206fdffcfa2df7cbe15601ef46c813fce0965eb3286db6b56c583b814b51c81c"
-dependencies = [
- "byteorder",
- "iovec",
-]
-
 [[package]]
 name = "bytes"
 version = "1.6.0"
@@ -269,9 +260,9 @@ dependencies = [
 
 [[package]]
 name = "camino"
-version = "1.1.6"
+version = "1.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c59e92b5a388f549b863a7bea62612c09f24c8393560709a54558a9abdfb3b9c"
+checksum = "e0ec6b951b160caa93cc0c7b209e5a3bff7aae9062213451ac99493cd844c239"
 dependencies = [
  "serde",
 ]
@@ -322,12 +313,13 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.0.90"
+version = "1.0.99"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5"
+checksum = "96c51067fd44124faa7f870b4b1c969379ad32b2ba805aa959430ceaa384f695"
 dependencies = [
  "jobserver",
  "libc",
+ "once_cell",
 ]
 
 [[package]]
@@ -345,7 +337,7 @@ dependencies = [
  "android-tzdata",
  "iana-time-zone",
  "num-traits",
- "windows-targets 0.52.4",
+ "windows-targets 0.52.5",
 ]
 
 [[package]]
@@ -387,9 +379,9 @@ dependencies = [
 
 [[package]]
 name = "clap-markdown"
-version = "0.1.3"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "325f50228f76921784b6d9f2d62de6778d834483248eefecd27279174797e579"
+checksum = "8ebc67e6266e14f8b31541c2f204724fa2ac7ad5c17d6f5908fbb92a60f42cff"
 dependencies = [
  "clap",
 ]
@@ -409,9 +401,9 @@ dependencies = [
 
 [[package]]
 name = "clap_complete"
-version = "4.5.5"
+version = "4.5.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2020fa13af48afc65a9a87335bda648309ab3d154cd03c7ff95b378c7ed39c4"
+checksum = "fbca90c87c2a04da41e95d1856e8bcd22f159bdbfa147314d2ce5218057b0e58"
 dependencies = [
  "clap",
 ]
@@ -432,7 +424,7 @@ version = "4.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c780290ccf4fb26629baa7a1081e68ced113f1d3ec302fa5948f1c381ebf06c6"
 dependencies = [
- "heck 0.5.0",
+ "heck",
  "proc-macro2",
  "quote",
  "syn",
@@ -440,15 +432,15 @@ dependencies = [
 
 [[package]]
 name = "clap_lex"
-version = "0.7.0"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce"
+checksum = "4b82cf0babdbd58558212896d1a4272303a57bdb245c2bf1147185fb45640e70"
 
 [[package]]
 name = "clap_mangen"
-version = "0.2.20"
+version = "0.2.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1dd95b5ebb5c1c54581dd6346f3ed6a79a3eef95dd372fc2ac13d535535300e"
+checksum = "74b70fc13e60c0e1d490dc50eb73a749be6d81f4ef03783df1d9b7b0c62bc937"
 dependencies = [
  "clap",
  "roff",
@@ -456,15 +448,15 @@ dependencies = [
 
 [[package]]
 name = "clru"
-version = "0.6.1"
+version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8191fa7302e03607ff0e237d4246cc043ff5b3cb9409d995172ba3bea16b807"
+checksum = "cbd0f76e066e64fdc5631e3bb46381254deab9ef1158292f27c8c57e3bf3fe59"
 
 [[package]]
 name = "colorchoice"
-version = "1.0.0"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
+checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422"
 
 [[package]]
 name = "compact_str"
@@ -522,9 +514,9 @@ dependencies = [
 
 [[package]]
 name = "crc32fast"
-version = "1.4.0"
+version = "1.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa"
+checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3"
 dependencies = [
  "cfg-if",
 ]
@@ -580,9 +572,9 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-channel"
-version = "0.5.12"
+version = "0.5.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95"
+checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2"
 dependencies = [
  "crossbeam-utils",
 ]
@@ -617,9 +609,9 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-utils"
-version = "0.8.19"
+version = "0.8.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345"
+checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"
 
 [[package]]
 name = "crossterm"
@@ -729,9 +721,9 @@ checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b"
 
 [[package]]
 name = "either"
-version = "1.12.0"
+version = "1.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b"
+checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
 
 [[package]]
 name = "encode_unicode"
@@ -747,9 +739,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
 
 [[package]]
 name = "errno"
-version = "0.3.8"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245"
+checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba"
 dependencies = [
  "libc",
  "windows-sys 0.52.0",
@@ -785,7 +777,7 @@ checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd"
 dependencies = [
  "cfg-if",
  "libc",
- "redox_syscall",
+ "redox_syscall 0.4.1",
  "windows-sys 0.52.0",
 ]
 
@@ -797,9 +789,9 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
 
 [[package]]
 name = "flate2"
-version = "1.0.28"
+version = "1.0.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e"
+checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae"
 dependencies = [
  "crc32fast",
  "miniz_oxide",
@@ -935,9 +927,9 @@ dependencies = [
 
 [[package]]
 name = "getrandom"
-version = "0.2.12"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5"
+checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
 dependencies = [
  "cfg-if",
  "libc",
@@ -946,9 +938,9 @@ dependencies = [
 
 [[package]]
 name = "gimli"
-version = "0.28.1"
+version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253"
+checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd"
 
 [[package]]
 name = "git2"
@@ -1017,7 +1009,7 @@ dependencies = [
  "gix-utils",
  "itoa",
  "thiserror",
- "winnow 0.6.5",
+ "winnow 0.6.13",
 ]
 
 [[package]]
@@ -1070,7 +1062,7 @@ dependencies = [
  "smallvec",
  "thiserror",
  "unicode-bom",
- "winnow 0.6.5",
+ "winnow 0.6.13",
 ]
 
 [[package]]
@@ -1150,9 +1142,9 @@ dependencies = [
 
 [[package]]
 name = "gix-fs"
-version = "0.11.0"
+version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f78f7d6dcda7a5809efd73a33b145e3dce7421c460df21f32126f9732736b0c"
+checksum = "c3338ff92a2164f5209f185ec0cd316f571a72676bb01d27e22f2867ba69f77a"
 dependencies = [
  "fastrand",
  "gix-features",
@@ -1161,9 +1153,9 @@ dependencies = [
 
 [[package]]
 name = "gix-glob"
-version = "0.16.2"
+version = "0.16.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "682bdc43cb3c00dbedfcc366de2a849b582efd8d886215dbad2ea662ec156bb5"
+checksum = "c2a29ad0990cf02c48a7aac76ed0dbddeb5a0d070034b83675cc3bbf937eace4"
 dependencies = [
  "bitflags 2.5.0",
  "bstr",
@@ -1258,7 +1250,7 @@ dependencies = [
  "itoa",
  "smallvec",
  "thiserror",
- "winnow 0.6.5",
+ "winnow 0.6.13",
 ]
 
 [[package]]
@@ -1328,9 +1320,9 @@ dependencies = [
 
 [[package]]
 name = "gix-ref"
-version = "0.44.0"
+version = "0.44.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b36752b448647acd59c9668fdd830b16d07db1e6d9c3b3af105c1605a6e23d9"
+checksum = "3394a2997e5bc6b22ebc1e1a87b41eeefbcfcff3dbfa7c4bd73cb0ac8f1f3e2e"
 dependencies = [
  "gix-actor",
  "gix-date",
@@ -1345,7 +1337,7 @@ dependencies = [
  "gix-validate",
  "memmap2",
  "thiserror",
- "winnow 0.6.5",
+ "winnow 0.6.13",
 ]
 
 [[package]]
@@ -1490,15 +1482,15 @@ dependencies = [
  "aho-corasick",
  "bstr",
  "log",
- "regex-automata 0.4.6",
- "regex-syntax 0.8.2",
+ "regex-automata 0.4.7",
+ "regex-syntax 0.8.4",
 ]
 
 [[package]]
 name = "half"
-version = "2.4.0"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5eceaaeec696539ddaf7b333340f1af35a5aa87ae3e4f3ead0532f72affab2e"
+checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888"
 dependencies = [
  "cfg-if",
  "crunchy",
@@ -1506,20 +1498,14 @@ dependencies = [
 
 [[package]]
 name = "hashbrown"
-version = "0.14.3"
+version = "0.14.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
+checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
 dependencies = [
  "ahash",
  "allocator-api2",
 ]
 
-[[package]]
-name = "heck"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
-
 [[package]]
 name = "heck"
 version = "0.5.0"
@@ -1590,7 +1576,7 @@ dependencies = [
  "globset",
  "log",
  "memchr",
- "regex-automata 0.4.6",
+ "regex-automata 0.4.7",
  "same-file",
  "walkdir",
  "winapi-util",
@@ -1627,22 +1613,13 @@ dependencies = [
 
 [[package]]
 name = "instant"
-version = "0.1.12"
+version = "0.1.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
+checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222"
 dependencies = [
  "cfg-if",
 ]
 
-[[package]]
-name = "iovec"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e"
-dependencies = [
- "libc",
-]
-
 [[package]]
 name = "is-terminal"
 version = "0.4.12"
@@ -1654,6 +1631,12 @@ dependencies = [
  "windows-sys 0.52.0",
 ]
 
+[[package]]
+name = "is_terminal_polyfill"
+version = "1.70.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800"
+
 [[package]]
 name = "itertools"
 version = "0.10.5"
@@ -1674,9 +1657,9 @@ dependencies = [
 
 [[package]]
 name = "itoa"
-version = "1.0.10"
+version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c"
+checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
 
 [[package]]
 name = "jj-cli"
@@ -1743,7 +1726,7 @@ dependencies = [
  "async-trait",
  "backoff",
  "blake2",
- "bytes 1.6.0",
+ "bytes",
  "chrono",
  "config",
  "criterion",
@@ -1802,9 +1785,9 @@ dependencies = [
 
 [[package]]
 name = "jobserver"
-version = "0.1.28"
+version = "0.1.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab46a6e9526ddef3ae7f787c06f0f2600639ba80ea3eade3d8e670a2230f51d6"
+checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e"
 dependencies = [
  "libc",
 ]
@@ -1856,13 +1839,12 @@ dependencies = [
 
 [[package]]
 name = "libredox"
-version = "0.0.1"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8"
+checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
 dependencies = [
  "bitflags 2.5.0",
  "libc",
- "redox_syscall",
 ]
 
 [[package]]
@@ -1881,9 +1863,9 @@ dependencies = [
 
 [[package]]
 name = "libz-sys"
-version = "1.1.16"
+version = "1.1.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e143b5e666b2695d28f6bca6497720813f699c9602dd7f5cac91008b8ada7f9"
+checksum = "c15da26e5af7e25c90b37a2d75cdbf940cf4a55316de9d84c679c9b8bfabf82e"
 dependencies = [
  "cc",
  "libc",
@@ -1899,15 +1881,15 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f"
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.4.13"
+version = "0.4.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c"
+checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
 
 [[package]]
 name = "lock_api"
-version = "0.4.11"
+version = "0.4.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45"
+checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17"
 dependencies = [
  "autocfg",
  "scopeguard",
@@ -1945,9 +1927,9 @@ dependencies = [
 
 [[package]]
 name = "memchr"
-version = "2.7.1"
+version = "2.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149"
+checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
 
 [[package]]
 name = "memmap2"
@@ -1966,9 +1948,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
 
 [[package]]
 name = "miniz_oxide"
-version = "0.7.2"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7"
+checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08"
 dependencies = [
  "adler",
 ]
@@ -2002,9 +1984,9 @@ dependencies = [
 
 [[package]]
 name = "multimap"
-version = "0.8.3"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a"
+checksum = "defc4c55412d89136f966bbb339008b474350e5e6e78d2714439c386b3137a03"
 
 [[package]]
 name = "nom"
@@ -2034,9 +2016,9 @@ checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
 
 [[package]]
 name = "num-traits"
-version = "0.2.18"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
  "autocfg",
 ]
@@ -2062,9 +2044,9 @@ dependencies = [
 
 [[package]]
 name = "object"
-version = "0.32.2"
+version = "0.36.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441"
+checksum = "576dfe1fc8f9df304abb159d767a29d0476f7750fbf8aa7ad07816004a207434"
 dependencies = [
  "memchr",
 ]
@@ -2092,18 +2074,18 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
 
 [[package]]
 name = "openssl-src"
-version = "300.2.3+3.2.1"
+version = "300.3.1+3.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cff92b6f71555b61bb9315f7c64da3ca43d87531622120fea0195fc761b4843"
+checksum = "7259953d42a81bf137fbbd73bd30a8e1914d6dce43c2b90ed575783a22608b91"
 dependencies = [
  "cc",
 ]
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.101"
+version = "0.9.102"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dda2b0f344e78efc2facf7d195d098df0dd72151b26ab98da807afc26c198dff"
+checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2"
 dependencies = [
  "cc",
  "libc",
@@ -2126,9 +2108,9 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
 
 [[package]]
 name = "parking_lot"
-version = "0.12.1"
+version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
+checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27"
 dependencies = [
  "lock_api",
  "parking_lot_core",
@@ -2136,22 +2118,22 @@ dependencies = [
 
 [[package]]
 name = "parking_lot_core"
-version = "0.9.9"
+version = "0.9.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e"
+checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
 dependencies = [
  "cfg-if",
  "libc",
- "redox_syscall",
+ "redox_syscall 0.5.2",
  "smallvec",
- "windows-targets 0.48.5",
+ "windows-targets 0.52.5",
 ]
 
 [[package]]
 name = "paste"
-version = "1.0.14"
+version = "1.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c"
+checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
 
 [[package]]
 name = "pathdiff"
@@ -2212,9 +2194,9 @@ dependencies = [
 
 [[package]]
 name = "petgraph"
-version = "0.6.4"
+version = "0.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9"
+checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db"
 dependencies = [
  "fixedbitset",
  "indexmap",
@@ -2222,9 +2204,9 @@ dependencies = [
 
 [[package]]
 name = "pin-project-lite"
-version = "0.2.13"
+version = "0.2.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58"
+checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02"
 
 [[package]]
 name = "pin-utils"
@@ -2240,9 +2222,9 @@ checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
 
 [[package]]
 name = "plotters"
-version = "0.3.5"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2c224ba00d7cadd4d5c660deaf2098e5e80e07846537c51f9cfa4be50c1fd45"
+checksum = "a15b6eccb8484002195a3e44fe65a4ce8e93a625797a063735536fd59cb01cf3"
 dependencies = [
  "num-traits",
  "plotters-backend",
@@ -2253,15 +2235,15 @@ dependencies = [
 
 [[package]]
 name = "plotters-backend"
-version = "0.3.5"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e76628b4d3a7581389a35d5b6e2139607ad7c75b17aed325f210aa91f4a9609"
+checksum = "414cec62c6634ae900ea1c56128dfe87cf63e7caece0852ec76aba307cebadb7"
 
 [[package]]
 name = "plotters-svg"
-version = "0.3.5"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38f6d39893cca0701371e3c27294f09797214b86f1fb951b89ade8ec04e2abab"
+checksum = "81b30686a7d9c3e010b84284bdd26a29f2138574f52f5eb6f794fc0ad924e705"
 dependencies = [
  "plotters-backend",
 ]
@@ -2323,9 +2305,9 @@ dependencies = [
 
 [[package]]
 name = "prettyplease"
-version = "0.2.16"
+version = "0.2.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a41cf62165e97c7f814d2221421dbb9afcbcdb0a88068e5ea206e19951c2cbb5"
+checksum = "5f12335488a2f3b0a83b14edad48dca9879ce89b2edd10e80237e4e852dd645e"
 dependencies = [
  "proc-macro2",
  "syn",
@@ -2333,9 +2315,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.85"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22244ce15aa966053a896d1accb3a6e68469b97c7f33f284b99f0d576879fc23"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
 dependencies = [
  "unicode-ident",
 ]
@@ -2352,7 +2334,7 @@ version = "0.12.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "deb1435c188b76130da55f17a466d252ff7b1418b2ad3e037d127b94e3411f29"
 dependencies = [
- "bytes 1.6.0",
+ "bytes",
  "prost-derive",
 ]
 
@@ -2362,8 +2344,8 @@ version = "0.12.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "22505a5c94da8e3b7c2996394d1c933236c4d743e81a410bcca4e6989fc066a4"
 dependencies = [
- "bytes 1.6.0",
- "heck 0.5.0",
+ "bytes",
+ "heck",
  "itertools 0.12.1",
  "log",
  "multimap",
@@ -2487,11 +2469,20 @@ dependencies = [
  "bitflags 1.3.2",
 ]
 
+[[package]]
+name = "redox_syscall"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c82cf8cff14456045f55ec4241383baeff27af886adb72ffb2162f99911de0fd"
+dependencies = [
+ "bitflags 2.5.0",
+]
+
 [[package]]
 name = "redox_users"
-version = "0.4.4"
+version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4"
+checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891"
 dependencies = [
  "getrandom",
  "libredox",
@@ -2526,8 +2517,8 @@ checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-automata 0.4.6",
- "regex-syntax 0.8.2",
+ "regex-automata 0.4.7",
+ "regex-syntax 0.8.4",
 ]
 
 [[package]]
@@ -2541,13 +2532,13 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.4.6"
+version = "0.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea"
+checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-syntax 0.8.2",
+ "regex-syntax 0.8.4",
 ]
 
 [[package]]
@@ -2558,9 +2549,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
 
 [[package]]
 name = "regex-syntax"
-version = "0.8.2"
+version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"
+checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"
 
 [[package]]
 name = "roff"
@@ -2591,9 +2582,9 @@ dependencies = [
 
 [[package]]
 name = "rustc-demangle"
-version = "0.1.23"
+version = "0.1.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
+checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
 
 [[package]]
 name = "rustix"
@@ -2610,15 +2601,15 @@ dependencies = [
 
 [[package]]
 name = "rustversion"
-version = "1.0.14"
+version = "1.0.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4"
+checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6"
 
 [[package]]
 name = "ryu"
-version = "1.0.17"
+version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1"
+checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
 
 [[package]]
 name = "same-file"
@@ -2654,9 +2645,9 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
 [[package]]
 name = "semver"
-version = "1.0.22"
+version = "1.0.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca"
+checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
 dependencies = [
  "serde",
 ]
@@ -2672,17 +2663,27 @@ dependencies = [
 
 [[package]]
 name = "serde_bser"
-version = "0.3.1"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b929ea725591083cbca8b8ea178ed6efc918eccd40b784e199ce88967104199"
+checksum = "a56b4bcc15e42e5b5ae16c6f75582bef80d36c6ffe2c03b1b5317754b38f8717"
 dependencies = [
  "anyhow",
  "byteorder",
- "bytes 0.4.12",
+ "bytes",
  "serde",
+ "serde_bytes",
  "thiserror",
 ]
 
+[[package]]
+name = "serde_bytes"
+version = "0.11.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b8497c313fd43ab992087548117643f6fcd935cbf36f176ffda0aacf9591734"
+dependencies = [
+ "serde",
+]
+
 [[package]]
 name = "serde_derive"
 version = "1.0.203"
@@ -2696,9 +2697,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.117"
+version = "1.0.118"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3"
+checksum = "d947f6b3163d8857ea16c4fa0dd4840d52f3041039a85decd46867eb1abef2e4"
 dependencies = [
  "itoa",
  "ryu",
@@ -2707,9 +2708,9 @@ dependencies = [
 
 [[package]]
 name = "serde_spanned"
-version = "0.6.5"
+version = "0.6.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1"
+checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0"
 dependencies = [
  "serde",
 ]
@@ -2763,18 +2764,18 @@ dependencies = [
 
 [[package]]
 name = "signal-hook-registry"
-version = "1.4.1"
+version = "1.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1"
+checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1"
 dependencies = [
  "libc",
 ]
 
 [[package]]
 name = "similar"
-version = "2.4.0"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32fea41aca09ee824cc9724996433064c89f7777e60762749a4170a14abbfa21"
+checksum = "fa42c91313f1d05da9b26f267f931cf178d4aba455b4c4622dd7355eb80c6640"
 
 [[package]]
 name = "slab"
@@ -2799,9 +2800,9 @@ checksum = "b7c388c1b5e93756d0c740965c41e8822f866621d41acbdf6336a6a168f8840c"
 
 [[package]]
 name = "socket2"
-version = "0.5.6"
+version = "0.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871"
+checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c"
 dependencies = [
  "libc",
  "windows-sys 0.52.0",
@@ -2840,11 +2841,11 @@ dependencies = [
 
 [[package]]
 name = "strum_macros"
-version = "0.26.2"
+version = "0.26.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6cf59daf282c0a494ba14fd21610a0325f9f90ec9d1231dea26bcb1d696c946"
+checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be"
 dependencies = [
- "heck 0.4.1",
+ "heck",
  "proc-macro2",
  "quote",
  "rustversion",
@@ -2853,15 +2854,15 @@ dependencies = [
 
 [[package]]
 name = "subtle"
-version = "2.5.0"
+version = "2.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc"
+checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
 
 [[package]]
 name = "syn"
-version = "2.0.66"
+version = "2.0.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5"
+checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3055,7 +3056,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a"
 dependencies = [
  "backtrace",
- "bytes 1.6.0",
+ "bytes",
  "libc",
  "mio",
  "num_cpus",
@@ -3084,7 +3085,7 @@ version = "0.6.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "36943ee01a6d67977dd3f84a5a1d2efeb4ada3a1ae771cadfaa535d9d9fc6507"
 dependencies = [
- "bytes 1.6.0",
+ "bytes",
  "futures-core",
  "futures-io",
  "futures-sink",
@@ -3105,9 +3106,9 @@ dependencies = [
 
 [[package]]
 name = "toml_datetime"
-version = "0.6.5"
+version = "0.6.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1"
+checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf"
 dependencies = [
  "serde",
 ]
@@ -3211,9 +3212,9 @@ checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9"
 
 [[package]]
 name = "uluru"
-version = "3.0.0"
+version = "3.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "794a32261a1f5eb6a4462c81b59cec87b5c27d5deea7dd1ac8fc781c41d226db"
+checksum = "7c8a2469e56e6e5095c82ccd3afb98dad95f7af7929aab6d8ba8d6e0f73657da"
 dependencies = [
  "arrayvec",
 ]
@@ -3275,9 +3276,9 @@ checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d"
 
 [[package]]
 name = "url"
-version = "2.5.0"
+version = "2.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633"
+checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c"
 dependencies = [
  "form_urlencoded",
  "idna",
@@ -3286,9 +3287,9 @@ dependencies = [
 
 [[package]]
 name = "utf8parse"
-version = "0.2.1"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
+checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
 
 [[package]]
 name = "valuable"
@@ -3395,12 +3396,12 @@ checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"
 
 [[package]]
 name = "watchman_client"
-version = "0.8.0"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "839fea2d85719bb69089290d7970bba2131f544448db8f990ea75813c30775ca"
+checksum = "88bc4c9bb443a7aae10d4fa7807bffc397805315e2305288c90c80e2f66cfb52"
 dependencies = [
  "anyhow",
- "bytes 1.6.0",
+ "bytes",
  "futures 0.3.30",
  "maplit",
  "serde",
@@ -3427,7 +3428,7 @@ version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a44ab49fad634e88f55bf8f9bb3abd2f27d7204172a112c7c9987e01c1c94ea9"
 dependencies = [
- "redox_syscall",
+ "redox_syscall 0.4.1",
  "wasite",
  "web-sys",
 ]
@@ -3450,11 +3451,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
 
 [[package]]
 name = "winapi-util"
-version = "0.1.6"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596"
+checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b"
 dependencies = [
- "winapi",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -3469,7 +3470,7 @@ version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
 dependencies = [
- "windows-targets 0.52.4",
+ "windows-targets 0.52.5",
 ]
 
 [[package]]
@@ -3487,7 +3488,7 @@ version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
 dependencies = [
- "windows-targets 0.52.4",
+ "windows-targets 0.52.5",
 ]
 
 [[package]]
@@ -3507,17 +3508,18 @@ dependencies = [
 
 [[package]]
 name = "windows-targets"
-version = "0.52.4"
+version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b"
+checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb"
 dependencies = [
- "windows_aarch64_gnullvm 0.52.4",
- "windows_aarch64_msvc 0.52.4",
- "windows_i686_gnu 0.52.4",
- "windows_i686_msvc 0.52.4",
- "windows_x86_64_gnu 0.52.4",
- "windows_x86_64_gnullvm 0.52.4",
- "windows_x86_64_msvc 0.52.4",
+ "windows_aarch64_gnullvm 0.52.5",
+ "windows_aarch64_msvc 0.52.5",
+ "windows_i686_gnu 0.52.5",
+ "windows_i686_gnullvm",
+ "windows_i686_msvc 0.52.5",
+ "windows_x86_64_gnu 0.52.5",
+ "windows_x86_64_gnullvm 0.52.5",
+ "windows_x86_64_msvc 0.52.5",
 ]
 
 [[package]]
@@ -3528,9 +3530,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
 
 [[package]]
 name = "windows_aarch64_gnullvm"
-version = "0.52.4"
+version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9"
+checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263"
 
 [[package]]
 name = "windows_aarch64_msvc"
@@ -3540,9 +3542,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
 
 [[package]]
 name = "windows_aarch64_msvc"
-version = "0.52.4"
+version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675"
+checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6"
 
 [[package]]
 name = "windows_i686_gnu"
@@ -3552,9 +3554,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
 
 [[package]]
 name = "windows_i686_gnu"
-version = "0.52.4"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670"
+
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3"
+checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9"
 
 [[package]]
 name = "windows_i686_msvc"
@@ -3564,9 +3572,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
 
 [[package]]
 name = "windows_i686_msvc"
-version = "0.52.4"
+version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02"
+checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf"
 
 [[package]]
 name = "windows_x86_64_gnu"
@@ -3576,9 +3584,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
 
 [[package]]
 name = "windows_x86_64_gnu"
-version = "0.52.4"
+version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03"
+checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
@@ -3588,9 +3596,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
-version = "0.52.4"
+version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177"
+checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596"
 
 [[package]]
 name = "windows_x86_64_msvc"
@@ -3600,9 +3608,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
 
 [[package]]
 name = "windows_x86_64_msvc"
-version = "0.52.4"
+version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8"
+checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0"
 
 [[package]]
 name = "winnow"
@@ -3615,9 +3623,9 @@ dependencies = [
 
 [[package]]
 name = "winnow"
-version = "0.6.5"
+version = "0.6.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dffa400e67ed5a4dd237983829e66475f0a4a26938c4b04c21baede6262215b8"
+checksum = "59b5e5f6c299a3c7890b876a2a587f3115162487e704907d9b6cd29473052ba1"
 dependencies = [
  "memchr",
 ]
@@ -3640,18 +3648,18 @@ checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.32"
+version = "0.7.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be"
+checksum = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.32"
+version = "0.7.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6"
+checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3679,9 +3687,9 @@ dependencies = [
 
 [[package]]
 name = "zstd-sys"
-version = "2.0.9+zstd.1.5.5"
+version = "2.0.11+zstd.1.5.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e16efa8a874a0481a574084d34cc26fdb3b99627480f785888deb6386506656"
+checksum = "75652c55c0b6f3e6f12eb786fe1bc960396bf05a1eb3bf1f3691c3610ac2e6d4"
 dependencies = [
  "cc",
  "pkg-config",
diff --git a/Cargo.toml b/Cargo.toml
index a40020d12f..4041e65b7b 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -33,7 +33,7 @@ clap = { version = "4.5.7", features = [
 ] }
 clap_complete = "4.5.5"
 clap_complete_nushell = "4.5.2"
-clap-markdown = "0.1.3"
+clap-markdown = "0.1.4"
 clap_mangen = "0.2.10"
 chrono = { version = "0.4.38", default-features = false, features = [
     "std",
@@ -44,7 +44,7 @@ criterion = "0.5.1"
 crossterm = { version = "0.27", default-features = false }
 digest = "0.10.7"
 dirs = "5.0.1"
-either = "1.12.0"
+either = "1.13.0"
 esl01-renderdag = "0.3.0"
 futures = "0.3.30"
 git2 = "0.18.3"
@@ -69,7 +69,7 @@ pest = "2.7.10"
 pest_derive = "2.7.10"
 pollster = "0.3.0"
 pretty_assertions = "1.4.0"
-proc-macro2 = "1.0.85"
+proc-macro2 = "1.0.86"
 prost = "0.12.6"
 prost-build = "0.12.6"
 quote = "1.0.36"
@@ -82,7 +82,7 @@ rpassword = "7.3.1"
 rustix = { version = "0.38.34", features = ["fs"] }
 scm-record = "0.3.0"
 serde = { version = "1.0", features = ["derive"] }
-serde_json = "1.0.117"
+serde_json = "1.0.118"
 slab = "0.4.9"
 smallvec = { version = "1.13.2", features = [
     "const_generics",
@@ -90,7 +90,7 @@ smallvec = { version = "1.13.2", features = [
     "union",
 ] }
 strsim = "0.11.1"
-syn = "2.0.66"
+syn = "2.0.68"
 tempfile = "3.10.1"
 test-case = "3.3.1"
 textwrap = "0.16.1"
@@ -108,7 +108,7 @@ tracing-subscriber = { version = "0.3.18", default-features = false, features =
 ] }
 unicode-width = "0.1.13"
 version_check = "0.9.4"
-watchman_client = { version = "0.8.0" }
+watchman_client = { version = "0.9.0" }
 whoami = "1.5.1"
 winreg = "0.52"
 zstd = "0.12.4"
diff --git a/cli/examples/custom-commit-templater/main.rs b/cli/examples/custom-commit-templater/main.rs
index 7cab31e7b6..0d9efe4729 100644
--- a/cli/examples/custom-commit-templater/main.rs
+++ b/cli/examples/custom-commit-templater/main.rs
@@ -30,8 +30,8 @@ use jj_lib::object_id::ObjectId;
 use jj_lib::repo::Repo;
 use jj_lib::revset::{
     FunctionCallNode, PartialSymbolResolver, RevsetExpression, RevsetFilterExtension,
-    RevsetFilterExtensionWrapper, RevsetFilterPredicate, RevsetParseContext, RevsetParseError,
-    RevsetResolutionError, SymbolResolverExtension,
+    RevsetFilterPredicate, RevsetParseContext, RevsetParseError, RevsetResolutionError,
+    SymbolResolverExtension,
 };
 use once_cell::sync::OnceCell;
 
@@ -185,7 +185,7 @@ fn even_digits(
 ) -> Result<Rc<RevsetExpression>, RevsetParseError> {
     function.expect_no_arguments()?;
     Ok(RevsetExpression::filter(RevsetFilterPredicate::Extension(
-        RevsetFilterExtensionWrapper(Rc::new(EvenDigitsFilter)),
+        Rc::new(EvenDigitsFilter),
     )))
 }
 
diff --git a/cli/src/cli_util.rs b/cli/src/cli_util.rs
index 18c44c33c1..e4474047d4 100644
--- a/cli/src/cli_util.rs
+++ b/cli/src/cli_util.rs
@@ -1112,6 +1112,11 @@ impl WorkspaceCommandHelper {
                 Ok(())
             };
         }
+
+        // Not using self.id_prefix_context() because the disambiguation data
+        // must not be calculated and cached against arbitrary repo. It's also
+        // unlikely that the immutable expression contains short hashes.
+        let id_prefix_context = IdPrefixContext::new(self.revset_extensions.clone());
         let to_rewrite_revset =
             RevsetExpression::commits(commits.into_iter().cloned().collect_vec());
         let immutable = revset_util::parse_immutable_expression(&self.revset_parse_context())
@@ -1121,7 +1126,7 @@ impl WorkspaceCommandHelper {
         let mut expression = RevsetExpressionEvaluator::new(
             repo,
             self.revset_extensions.clone(),
-            self.id_prefix_context()?,
+            &id_prefix_context,
             immutable,
         );
         expression.intersect_with(&to_rewrite_revset);
@@ -1222,7 +1227,7 @@ See https://github.com/martinvonz/jj/blob/main/docs/working-copy.md#stale-workin
         let progress = crate::progress::snapshot_progress(ui);
         let new_tree_id = locked_ws.locked_wc().snapshot(SnapshotOptions {
             base_ignores,
-            fsmonitor_kind: self.settings.fsmonitor_kind()?,
+            fsmonitor_settings: self.settings.fsmonitor_settings()?,
             progress: progress.as_ref().map(|x| x as _),
             max_new_file_size: self.settings.max_new_file_size()?,
         })?;
@@ -1408,9 +1413,8 @@ See https://github.com/martinvonz/jj/blob/main/docs/working-copy.md#stale-workin
         // are millions of commits added to the repo, assuming the revset engine can
         // efficiently skip non-conflicting commits. Filter out empty commits mostly so
         // `jj new <conflicted commit>` doesn't result in a message about new conflicts.
-        let conflicts = RevsetExpression::filter(RevsetFilterPredicate::HasConflict).intersection(
-            &RevsetExpression::filter(RevsetFilterPredicate::File(FilesetExpression::all())),
-        );
+        let conflicts = RevsetExpression::filter(RevsetFilterPredicate::HasConflict)
+            .filtered(RevsetFilterPredicate::File(FilesetExpression::all()));
         let removed_conflicts_expr = new_heads.range(&old_heads).intersection(&conflicts);
         let added_conflicts_expr = old_heads.range(&new_heads).intersection(&conflicts);
 
@@ -1845,6 +1849,7 @@ pub fn print_conflicted_paths(
         .map(|p| format!("{:width$}", p, width = max_path_len.min(32) + 3));
 
     for ((_, conflict), formatted_path) in std::iter::zip(conflicts.iter(), formatted_paths) {
+        let conflict = conflict.clone().simplify();
         let sides = conflict.num_sides();
         let n_adds = conflict.adds().flatten().count();
         let deletions = sides - n_adds;
@@ -1941,15 +1946,13 @@ pub fn print_checkout_stats(
              working copy.",
             stats.skipped_files
         )?;
-        if let Some(mut writer) = ui.hint_default() {
-            writeln!(
-                writer,
-                "Inspect the changes compared to the intended target with `jj diff --from {}`.
+        writeln!(
+            ui.hint_default(),
+            "Inspect the changes compared to the intended target with `jj diff --from {}`.
 Discard the conflicting changes with `jj restore --from {}`.",
-                short_commit_hash(new_commit.id()),
-                short_commit_hash(new_commit.id())
-            )?;
-        }
+            short_commit_hash(new_commit.id()),
+            short_commit_hash(new_commit.id())
+        )?;
     }
     Ok(())
 }
@@ -1997,21 +2000,17 @@ pub fn print_trackable_remote_branches(ui: &Ui, view: &View) -> io::Result<()> {
         return Ok(());
     }
 
-    if let Some(mut writer) = ui.hint_default() {
+    if let Some(mut formatter) = ui.status_formatter() {
         writeln!(
-            writer,
+            formatter.labeled("hint").with_heading("Hint: "),
             "The following remote branches aren't associated with the existing local branches:"
         )?;
-    }
-    if let Some(mut formatter) = ui.status_formatter() {
         for full_name in &remote_branch_names {
             write!(formatter, "  ")?;
             writeln!(formatter.labeled("branch"), "{full_name}")?;
         }
-    }
-    if let Some(mut writer) = ui.hint_default() {
         writeln!(
-            writer,
+            formatter.labeled("hint").with_heading("Hint: "),
             "Run `jj branch track {names}` to keep local branches updated on future pulls.",
             names = remote_branch_names.join(" "),
         )?;
@@ -2397,8 +2396,8 @@ pub struct EarlyArgs {
     pub color: Option<ColorChoice>,
     /// Silence non-primary command output
     ///
-    /// For example, `jj files` will still list files, but it won't tell you if
-    /// the working copy was snapshotted or if descendants were rebased.
+    /// For example, `jj file list ` will still list files, but it won't tell
+    /// you if the working copy was snapshotted or if descendants were rebased.
     ///
     /// Warnings and errors will still be printed.
     #[arg(long, global = true, action = ArgAction::SetTrue)]
@@ -2491,14 +2490,14 @@ fn resolve_default_command(
         if matches.subcommand_name().is_none() {
             let args = get_string_or_array(config, "ui.default-command").optional()?;
             if args.is_none() {
-                if let Some(mut writer) = ui.hint_default() {
-                    writeln!(writer, "Use `jj -h` for a list of available commands.")?;
-                    writeln!(
-                        writer,
-                        "Run `jj config set --user ui.default-command log` to disable this \
-                         message."
-                    )?;
-                }
+                writeln!(
+                    ui.hint_default(),
+                    "Use `jj -h` for a list of available commands."
+                )?;
+                writeln!(
+                    ui.hint_no_heading(),
+                    "Run `jj config set --user ui.default-command log` to disable this message."
+                )?;
             }
             let default_command = args.unwrap_or_else(|| vec!["log".to_string()]);
 
diff --git a/cli/src/commands/branch.rs b/cli/src/commands/branch.rs
deleted file mode 100644
index 84974057fa..0000000000
--- a/cli/src/commands/branch.rs
+++ /dev/null
@@ -1,791 +0,0 @@
-// Copyright 2020-2023 The Jujutsu Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-use std::collections::{HashMap, HashSet};
-use std::fmt;
-use std::io::Write as _;
-
-use clap::builder::NonEmptyStringValueParser;
-use itertools::Itertools;
-use jj_lib::git;
-use jj_lib::object_id::ObjectId;
-use jj_lib::op_store::{RefTarget, RemoteRef};
-use jj_lib::repo::Repo;
-use jj_lib::revset::RevsetExpression;
-use jj_lib::str_util::StringPattern;
-use jj_lib::view::View;
-
-use crate::cli_util::{CommandHelper, RemoteBranchName, RemoteBranchNamePattern, RevisionArg};
-use crate::command_error::{user_error, user_error_with_hint, CommandError};
-use crate::commit_templater::{CommitTemplateLanguage, RefName};
-use crate::ui::Ui;
-
-/// Manage branches.
-///
-/// For information about branches, see
-/// https://github.com/martinvonz/jj/blob/main/docs/branches.md.
-#[derive(clap::Subcommand, Clone, Debug)]
-pub enum BranchCommand {
-    #[command(visible_alias("c"))]
-    Create(BranchCreateArgs),
-    #[command(visible_alias("d"))]
-    Delete(BranchDeleteArgs),
-    #[command(visible_alias("f"))]
-    Forget(BranchForgetArgs),
-    #[command(visible_alias("l"))]
-    List(BranchListArgs),
-    #[command(visible_alias("r"))]
-    Rename(BranchRenameArgs),
-    #[command(visible_alias("s"))]
-    Set(BranchSetArgs),
-    #[command(visible_alias("t"))]
-    Track(BranchTrackArgs),
-    Untrack(BranchUntrackArgs),
-}
-
-/// Create a new branch.
-#[derive(clap::Args, Clone, Debug)]
-pub struct BranchCreateArgs {
-    /// The branch's target revision.
-    #[arg(long, short)]
-    revision: Option<RevisionArg>,
-
-    /// The branches to create.
-    #[arg(required = true, value_parser=NonEmptyStringValueParser::new())]
-    names: Vec<String>,
-}
-
-/// Delete an existing branch and propagate the deletion to remotes on the
-/// next push.
-#[derive(clap::Args, Clone, Debug)]
-pub struct BranchDeleteArgs {
-    /// The branches to delete
-    ///
-    /// By default, the specified name matches exactly. Use `glob:` prefix to
-    /// select branches by wildcard pattern. For details, see
-    /// https://github.com/martinvonz/jj/blob/main/docs/revsets.md#string-patterns.
-    #[arg(required_unless_present_any(&["glob"]), value_parser = StringPattern::parse)]
-    pub names: Vec<StringPattern>,
-
-    /// Deprecated. Please prefix the pattern with `glob:` instead.
-    #[arg(long, hide = true, value_parser = StringPattern::glob)]
-    pub glob: Vec<StringPattern>,
-}
-
-/// List branches and their targets
-///
-/// By default, a tracking remote branch will be included only if its target is
-/// different from the local target. A non-tracking remote branch won't be
-/// listed. For a conflicted branch (both local and remote), old target
-/// revisions are preceded by a "-" and new target revisions are preceded by a
-/// "+".
-///
-/// For information about branches, see
-/// https://github.com/martinvonz/jj/blob/main/docs/branches.md.
-#[derive(clap::Args, Clone, Debug)]
-pub struct BranchListArgs {
-    /// Show all tracking and non-tracking remote branches including the ones
-    /// whose targets are synchronized with the local branches.
-    #[arg(long, short, alias = "all")]
-    all_remotes: bool,
-
-    /// Show remote tracked branches only. Omits local Git-tracking branches by
-    /// default.
-    #[arg(long, short, conflicts_with_all = ["all_remotes"])]
-    tracked: bool,
-
-    /// Show conflicted branches only.
-    #[arg(long, short, conflicts_with_all = ["all_remotes"])]
-    conflicted: bool,
-
-    /// Show branches whose local name matches
-    ///
-    /// By default, the specified name matches exactly. Use `glob:` prefix to
-    /// select branches by wildcard pattern. For details, see
-    /// https://github.com/martinvonz/jj/blob/main/docs/revsets.md#string-patterns.
-    #[arg(value_parser = StringPattern::parse)]
-    pub names: Vec<StringPattern>,
-
-    /// Show branches whose local targets are in the given revisions.
-    ///
-    /// Note that `-r deleted_branch` will not work since `deleted_branch`
-    /// wouldn't have a local target.
-    #[arg(long, short)]
-    revisions: Vec<RevisionArg>,
-
-    /// Render each branch using the given template
-    ///
-    /// All 0-argument methods of the `RefName` type are available as keywords.
-    ///
-    /// For the syntax, see https://github.com/martinvonz/jj/blob/main/docs/templates.md
-    #[arg(long, short = 'T')]
-    template: Option<String>,
-}
-
-/// Forget everything about a branch, including its local and remote
-/// targets.
-///
-/// A forgotten branch will not impact remotes on future pushes. It will be
-/// recreated on future pulls if it still exists in the remote.
-#[derive(clap::Args, Clone, Debug)]
-pub struct BranchForgetArgs {
-    /// The branches to forget
-    ///
-    /// By default, the specified name matches exactly. Use `glob:` prefix to
-    /// select branches by wildcard pattern. For details, see
-    /// https://github.com/martinvonz/jj/blob/main/docs/revsets.md#string-patterns.
-    #[arg(required_unless_present_any(&["glob"]), value_parser = StringPattern::parse)]
-    pub names: Vec<StringPattern>,
-
-    /// Deprecated. Please prefix the pattern with `glob:` instead.
-    #[arg(long, hide = true, value_parser = StringPattern::glob)]
-    pub glob: Vec<StringPattern>,
-}
-
-/// Rename `old` branch name to `new` branch name.
-///
-/// The new branch name points at the same commit as the old
-/// branch name.
-#[derive(clap::Args, Clone, Debug)]
-pub struct BranchRenameArgs {
-    /// The old name of the branch.
-    pub old: String,
-
-    /// The new name of the branch.
-    pub new: String,
-}
-
-/// Update an existing branch to point to a certain commit.
-#[derive(clap::Args, Clone, Debug)]
-pub struct BranchSetArgs {
-    /// The branch's target revision.
-    #[arg(long, short)]
-    pub revision: Option<RevisionArg>,
-
-    /// Allow moving the branch backwards or sideways.
-    #[arg(long, short = 'B')]
-    pub allow_backwards: bool,
-
-    /// The branches to update.
-    #[arg(required = true)]
-    pub names: Vec<String>,
-}
-
-/// Start tracking given remote branches
-///
-/// A tracking remote branch will be imported as a local branch of the same
-/// name. Changes to it will propagate to the existing local branch on future
-/// pulls.
-#[derive(clap::Args, Clone, Debug)]
-pub struct BranchTrackArgs {
-    /// Remote branches to track
-    ///
-    /// By default, the specified name matches exactly. Use `glob:` prefix to
-    /// select branches by wildcard pattern. For details, see
-    /// https://github.com/martinvonz/jj/blob/main/docs/revsets.md#string-patterns.
-    ///
-    /// Examples: branch@remote, glob:main@*, glob:jjfan-*@upstream
-    #[arg(required = true, value_name = "BRANCH@REMOTE")]
-    pub names: Vec<RemoteBranchNamePattern>,
-}
-
-/// Stop tracking given remote branches
-///
-/// A non-tracking remote branch is just a pointer to the last-fetched remote
-/// branch. It won't be imported as a local branch on future pulls.
-#[derive(clap::Args, Clone, Debug)]
-pub struct BranchUntrackArgs {
-    /// Remote branches to untrack
-    ///
-    /// By default, the specified name matches exactly. Use `glob:` prefix to
-    /// select branches by wildcard pattern. For details, see
-    /// https://github.com/martinvonz/jj/blob/main/docs/revsets.md#string-patterns.
-    ///
-    /// Examples: branch@remote, glob:main@*, glob:jjfan-*@upstream
-    #[arg(required = true, value_name = "BRANCH@REMOTE")]
-    pub names: Vec<RemoteBranchNamePattern>,
-}
-
-fn make_branch_term(branch_names: &[impl fmt::Display]) -> String {
-    match branch_names {
-        [branch_name] => format!("branch {}", branch_name),
-        branch_names => format!("branches {}", branch_names.iter().join(", ")),
-    }
-}
-
-pub fn cmd_branch(
-    ui: &mut Ui,
-    command: &CommandHelper,
-    subcommand: &BranchCommand,
-) -> Result<(), CommandError> {
-    match subcommand {
-        BranchCommand::Create(sub_args) => cmd_branch_create(ui, command, sub_args),
-        BranchCommand::Rename(sub_args) => cmd_branch_rename(ui, command, sub_args),
-        BranchCommand::Set(sub_args) => cmd_branch_set(ui, command, sub_args),
-        BranchCommand::Delete(sub_args) => cmd_branch_delete(ui, command, sub_args),
-        BranchCommand::Forget(sub_args) => cmd_branch_forget(ui, command, sub_args),
-        BranchCommand::Track(sub_args) => cmd_branch_track(ui, command, sub_args),
-        BranchCommand::Untrack(sub_args) => cmd_branch_untrack(ui, command, sub_args),
-        BranchCommand::List(sub_args) => cmd_branch_list(ui, command, sub_args),
-    }
-}
-
-fn cmd_branch_create(
-    ui: &mut Ui,
-    command: &CommandHelper,
-    args: &BranchCreateArgs,
-) -> Result<(), CommandError> {
-    let mut workspace_command = command.workspace_helper(ui)?;
-    let target_commit =
-        workspace_command.resolve_single_rev(args.revision.as_ref().unwrap_or(&RevisionArg::AT))?;
-    let view = workspace_command.repo().view();
-    let branch_names = &args.names;
-    if let Some(branch_name) = branch_names
-        .iter()
-        .find(|&name| view.get_local_branch(name).is_present())
-    {
-        return Err(user_error_with_hint(
-            format!("Branch already exists: {branch_name}"),
-            "Use `jj branch set` to update it.",
-        ));
-    }
-
-    if branch_names.len() > 1 {
-        writeln!(
-            ui.warning_default(),
-            "Creating multiple branches: {}",
-            branch_names.join(", "),
-        )?;
-    }
-
-    let mut tx = workspace_command.start_transaction();
-    for branch_name in branch_names {
-        tx.mut_repo()
-            .set_local_branch_target(branch_name, RefTarget::normal(target_commit.id().clone()));
-    }
-    tx.finish(
-        ui,
-        format!(
-            "create {} pointing to commit {}",
-            make_branch_term(branch_names),
-            target_commit.id().hex()
-        ),
-    )?;
-    Ok(())
-}
-
-fn cmd_branch_rename(
-    ui: &mut Ui,
-    command: &CommandHelper,
-    args: &BranchRenameArgs,
-) -> Result<(), CommandError> {
-    let mut workspace_command = command.workspace_helper(ui)?;
-    let view = workspace_command.repo().view();
-    let old_branch = &args.old;
-    let ref_target = view.get_local_branch(old_branch).clone();
-    if ref_target.is_absent() {
-        return Err(user_error(format!("No such branch: {old_branch}")));
-    }
-
-    let new_branch = &args.new;
-    if view.get_local_branch(new_branch).is_present() {
-        return Err(user_error(format!("Branch already exists: {new_branch}")));
-    }
-
-    let mut tx = workspace_command.start_transaction();
-    tx.mut_repo()
-        .set_local_branch_target(new_branch, ref_target);
-    tx.mut_repo()
-        .set_local_branch_target(old_branch, RefTarget::absent());
-    tx.finish(
-        ui,
-        format!(
-            "rename {} to {}",
-            make_branch_term(&[old_branch]),
-            make_branch_term(&[new_branch]),
-        ),
-    )?;
-
-    let view = workspace_command.repo().view();
-    if view
-        .remote_branches_matching(
-            &StringPattern::exact(old_branch),
-            &StringPattern::everything(),
-        )
-        .any(|(_, remote_ref)| remote_ref.is_tracking())
-    {
-        writeln!(
-            ui.warning_default(),
-            "Branch {old_branch} has tracking remote branches which were not renamed."
-        )?;
-        if let Some(mut writer) = ui.hint_default() {
-            writeln!(
-                writer,
-                "to rename the branch on the remote, you can `jj git push --branch {old_branch}` \
-                 first (to delete it on the remote), and then `jj git push --branch \
-                 {new_branch}`. `jj git push --all` would also be sufficient."
-            )?;
-        }
-    }
-
-    Ok(())
-}
-
-fn cmd_branch_set(
-    ui: &mut Ui,
-    command: &CommandHelper,
-    args: &BranchSetArgs,
-) -> Result<(), CommandError> {
-    let mut workspace_command = command.workspace_helper(ui)?;
-    let target_commit =
-        workspace_command.resolve_single_rev(args.revision.as_ref().unwrap_or(&RevisionArg::AT))?;
-    let repo = workspace_command.repo().as_ref();
-    let is_fast_forward = |old_target: &RefTarget| {
-        // Strictly speaking, "all" old targets should be ancestors, but we allow
-        // conflict resolution by setting branch to "any" of the old target descendants.
-        old_target
-            .added_ids()
-            .any(|old| repo.index().is_ancestor(old, target_commit.id()))
-    };
-    let branch_names = &args.names;
-    for name in branch_names {
-        let old_target = repo.view().get_local_branch(name);
-        if old_target.is_absent() {
-            return Err(user_error_with_hint(
-                format!("No such branch: {name}"),
-                "Use `jj branch create` to create it.",
-            ));
-        }
-        if !args.allow_backwards && !is_fast_forward(old_target) {
-            return Err(user_error_with_hint(
-                format!("Refusing to move branch backwards or sideways: {name}"),
-                "Use --allow-backwards to allow it.",
-            ));
-        }
-    }
-
-    if branch_names.len() > 1 {
-        writeln!(
-            ui.warning_default(),
-            "Updating multiple branches: {}",
-            branch_names.join(", "),
-        )?;
-    }
-
-    let mut tx = workspace_command.start_transaction();
-    for branch_name in branch_names {
-        tx.mut_repo()
-            .set_local_branch_target(branch_name, RefTarget::normal(target_commit.id().clone()));
-    }
-    tx.finish(
-        ui,
-        format!(
-            "point {} to commit {}",
-            make_branch_term(branch_names),
-            target_commit.id().hex()
-        ),
-    )?;
-    Ok(())
-}
-
-fn find_local_branches(
-    view: &View,
-    name_patterns: &[StringPattern],
-) -> Result<Vec<String>, CommandError> {
-    find_branches_with(name_patterns, |pattern| {
-        view.local_branches_matching(pattern)
-            .map(|(name, _)| name.to_owned())
-    })
-}
-
-fn find_forgettable_branches(
-    view: &View,
-    name_patterns: &[StringPattern],
-) -> Result<Vec<String>, CommandError> {
-    find_branches_with(name_patterns, |pattern| {
-        view.branches()
-            .filter(|(name, _)| pattern.matches(name))
-            .map(|(name, _)| name.to_owned())
-    })
-}
-
-fn find_branches_with<'a, I: Iterator<Item = String>>(
-    name_patterns: &'a [StringPattern],
-    mut find_matches: impl FnMut(&'a StringPattern) -> I,
-) -> Result<Vec<String>, CommandError> {
-    let mut matching_branches: Vec<String> = vec![];
-    let mut unmatched_patterns = vec![];
-    for pattern in name_patterns {
-        let mut names = find_matches(pattern).peekable();
-        if names.peek().is_none() {
-            unmatched_patterns.push(pattern);
-        }
-        matching_branches.extend(names);
-    }
-    match &unmatched_patterns[..] {
-        [] => {
-            matching_branches.sort_unstable();
-            matching_branches.dedup();
-            Ok(matching_branches)
-        }
-        [pattern] if pattern.is_exact() => Err(user_error(format!("No such branch: {pattern}"))),
-        patterns => Err(user_error(format!(
-            "No matching branches for patterns: {}",
-            patterns.iter().join(", ")
-        ))),
-    }
-}
-
-fn find_remote_branches<'a>(
-    view: &'a View,
-    name_patterns: &[RemoteBranchNamePattern],
-) -> Result<Vec<(RemoteBranchName, &'a RemoteRef)>, CommandError> {
-    let mut matching_branches = vec![];
-    let mut unmatched_patterns = vec![];
-    for pattern in name_patterns {
-        let mut matches = view
-            .remote_branches_matching(&pattern.branch, &pattern.remote)
-            .map(|((branch, remote), remote_ref)| {
-                let name = RemoteBranchName {
-                    branch: branch.to_owned(),
-                    remote: remote.to_owned(),
-                };
-                (name, remote_ref)
-            })
-            .peekable();
-        if matches.peek().is_none() {
-            unmatched_patterns.push(pattern);
-        }
-        matching_branches.extend(matches);
-    }
-    match &unmatched_patterns[..] {
-        [] => {
-            matching_branches.sort_unstable_by(|(name1, _), (name2, _)| name1.cmp(name2));
-            matching_branches.dedup_by(|(name1, _), (name2, _)| name1 == name2);
-            Ok(matching_branches)
-        }
-        [pattern] if pattern.is_exact() => {
-            Err(user_error(format!("No such remote branch: {pattern}")))
-        }
-        patterns => Err(user_error(format!(
-            "No matching remote branches for patterns: {}",
-            patterns.iter().join(", ")
-        ))),
-    }
-}
-
-fn cmd_branch_delete(
-    ui: &mut Ui,
-    command: &CommandHelper,
-    args: &BranchDeleteArgs,
-) -> Result<(), CommandError> {
-    let mut workspace_command = command.workspace_helper(ui)?;
-    let view = workspace_command.repo().view();
-    if !args.glob.is_empty() {
-        writeln!(
-            ui.warning_default(),
-            "--glob has been deprecated. Please prefix the pattern with `glob:` instead."
-        )?;
-    }
-    let name_patterns = [&args.names[..], &args.glob[..]].concat();
-    let names = find_local_branches(view, &name_patterns)?;
-    let mut tx = workspace_command.start_transaction();
-    for branch_name in names.iter() {
-        tx.mut_repo()
-            .set_local_branch_target(branch_name, RefTarget::absent());
-    }
-    tx.finish(ui, format!("delete {}", make_branch_term(&names)))?;
-    if names.len() > 1 {
-        writeln!(ui.status(), "Deleted {} branches.", names.len())?;
-    }
-    Ok(())
-}
-
-fn cmd_branch_forget(
-    ui: &mut Ui,
-    command: &CommandHelper,
-    args: &BranchForgetArgs,
-) -> Result<(), CommandError> {
-    let mut workspace_command = command.workspace_helper(ui)?;
-    let view = workspace_command.repo().view();
-    if !args.glob.is_empty() {
-        writeln!(
-            ui.warning_default(),
-            "--glob has been deprecated. Please prefix the pattern with `glob:` instead."
-        )?;
-    }
-    let name_patterns = [&args.names[..], &args.glob[..]].concat();
-    let names = find_forgettable_branches(view, &name_patterns)?;
-    let mut tx = workspace_command.start_transaction();
-    for branch_name in names.iter() {
-        tx.mut_repo().remove_branch(branch_name);
-    }
-    tx.finish(ui, format!("forget {}", make_branch_term(&names)))?;
-    if names.len() > 1 {
-        writeln!(ui.status(), "Forgot {} branches.", names.len())?;
-    }
-    Ok(())
-}
-
-fn cmd_branch_track(
-    ui: &mut Ui,
-    command: &CommandHelper,
-    args: &BranchTrackArgs,
-) -> Result<(), CommandError> {
-    let mut workspace_command = command.workspace_helper(ui)?;
-    let view = workspace_command.repo().view();
-    let mut names = Vec::new();
-    for (name, remote_ref) in find_remote_branches(view, &args.names)? {
-        if remote_ref.is_tracking() {
-            writeln!(
-                ui.warning_default(),
-                "Remote branch already tracked: {name}"
-            )?;
-        } else {
-            names.push(name);
-        }
-    }
-    let mut tx = workspace_command.start_transaction();
-    for name in &names {
-        tx.mut_repo()
-            .track_remote_branch(&name.branch, &name.remote);
-    }
-    tx.finish(ui, format!("track remote {}", make_branch_term(&names)))?;
-    if names.len() > 1 {
-        writeln!(
-            ui.status(),
-            "Started tracking {} remote branches.",
-            names.len()
-        )?;
-    }
-
-    //show conflicted branches if there are some
-
-    if let Some(mut formatter) = ui.status_formatter() {
-        let template = {
-            let language = workspace_command.commit_template_language()?;
-            let text = command
-                .settings()
-                .config()
-                .get::<String>("templates.branch_list")?;
-            workspace_command
-                .parse_template(&language, &text, CommitTemplateLanguage::wrap_ref_name)?
-                .labeled("branch_list")
-        };
-
-        let mut remote_per_branch: HashMap<&str, Vec<&str>> = HashMap::new();
-        for n in names.iter() {
-            remote_per_branch
-                .entry(&n.branch)
-                .or_default()
-                .push(&n.remote);
-        }
-        let branches_to_list =
-            workspace_command
-                .repo()
-                .view()
-                .branches()
-                .filter(|(name, target)| {
-                    remote_per_branch.contains_key(name) && target.local_target.has_conflict()
-                });
-
-        for (name, branch_target) in branches_to_list {
-            let local_target = branch_target.local_target;
-            let ref_name = RefName::local(
-                name,
-                local_target.clone(),
-                branch_target.remote_refs.iter().map(|x| x.1),
-            );
-            template.format(&ref_name, formatter.as_mut())?;
-
-            for (remote_name, remote_ref) in branch_target.remote_refs {
-                if remote_per_branch[name].contains(&remote_name) {
-                    let ref_name =
-                        RefName::remote(name, remote_name, remote_ref.clone(), local_target);
-                    template.format(&ref_name, formatter.as_mut())?;
-                }
-            }
-        }
-    }
-    Ok(())
-}
-
-fn cmd_branch_untrack(
-    ui: &mut Ui,
-    command: &CommandHelper,
-    args: &BranchUntrackArgs,
-) -> Result<(), CommandError> {
-    let mut workspace_command = command.workspace_helper(ui)?;
-    let view = workspace_command.repo().view();
-    let mut names = Vec::new();
-    for (name, remote_ref) in find_remote_branches(view, &args.names)? {
-        if name.remote == git::REMOTE_NAME_FOR_LOCAL_GIT_REPO {
-            // This restriction can be lifted if we want to support untracked @git branches.
-            writeln!(
-                ui.warning_default(),
-                "Git-tracking branch cannot be untracked: {name}"
-            )?;
-        } else if !remote_ref.is_tracking() {
-            writeln!(
-                ui.warning_default(),
-                "Remote branch not tracked yet: {name}"
-            )?;
-        } else {
-            names.push(name);
-        }
-    }
-    let mut tx = workspace_command.start_transaction();
-    for name in &names {
-        tx.mut_repo()
-            .untrack_remote_branch(&name.branch, &name.remote);
-    }
-    tx.finish(ui, format!("untrack remote {}", make_branch_term(&names)))?;
-    if names.len() > 1 {
-        writeln!(
-            ui.status(),
-            "Stopped tracking {} remote branches.",
-            names.len()
-        )?;
-    }
-    Ok(())
-}
-
-fn cmd_branch_list(
-    ui: &mut Ui,
-    command: &CommandHelper,
-    args: &BranchListArgs,
-) -> Result<(), CommandError> {
-    let workspace_command = command.workspace_helper(ui)?;
-    let repo = workspace_command.repo();
-    let view = repo.view();
-
-    // Like cmd_git_push(), names and revisions are OR-ed.
-    let branch_names_to_list = if !args.names.is_empty() || !args.revisions.is_empty() {
-        let mut branch_names: HashSet<&str> = HashSet::new();
-        if !args.names.is_empty() {
-            branch_names.extend(
-                view.branches()
-                    .filter(|&(name, _)| args.names.iter().any(|pattern| pattern.matches(name)))
-                    .map(|(name, _)| name),
-            );
-        }
-        if !args.revisions.is_empty() {
-            // Match against local targets only, which is consistent with "jj git push".
-            let mut expression = workspace_command.parse_union_revsets(&args.revisions)?;
-            // Intersects with the set of local branch targets to minimize the lookup space.
-            expression.intersect_with(&RevsetExpression::branches(StringPattern::everything()));
-            let filtered_targets: HashSet<_> = expression.evaluate_to_commit_ids()?.collect();
-            branch_names.extend(
-                view.local_branches()
-                    .filter(|(_, target)| {
-                        target.added_ids().any(|id| filtered_targets.contains(id))
-                    })
-                    .map(|(name, _)| name),
-            );
-        }
-        Some(branch_names)
-    } else {
-        None
-    };
-
-    let template = {
-        let language = workspace_command.commit_template_language()?;
-        let text = match &args.template {
-            Some(value) => value.to_owned(),
-            None => command.settings().config().get("templates.branch_list")?,
-        };
-        workspace_command
-            .parse_template(&language, &text, CommitTemplateLanguage::wrap_ref_name)?
-            .labeled("branch_list")
-    };
-
-    ui.request_pager();
-    let mut formatter = ui.stdout_formatter();
-
-    let mut found_deleted_local_branch = false;
-    let mut found_deleted_tracking_local_branch = false;
-    let branches_to_list = view.branches().filter(|(name, target)| {
-        branch_names_to_list
-            .as_ref()
-            .map_or(true, |branch_names| branch_names.contains(name))
-            && (!args.conflicted || target.local_target.has_conflict())
-    });
-    for (name, branch_target) in branches_to_list {
-        let local_target = branch_target.local_target;
-        let remote_refs = branch_target.remote_refs;
-        let (mut tracking_remote_refs, untracked_remote_refs) = remote_refs
-            .iter()
-            .copied()
-            .partition::<Vec<_>, _>(|&(_, remote_ref)| remote_ref.is_tracking());
-
-        if args.tracked {
-            tracking_remote_refs
-                .retain(|&(remote, _)| remote != git::REMOTE_NAME_FOR_LOCAL_GIT_REPO);
-        } else if !args.all_remotes {
-            tracking_remote_refs.retain(|&(_, remote_ref)| remote_ref.target != *local_target);
-        }
-
-        if !args.tracked && local_target.is_present() || !tracking_remote_refs.is_empty() {
-            let ref_name = RefName::local(
-                name,
-                local_target.clone(),
-                remote_refs.iter().map(|&(_, remote_ref)| remote_ref),
-            );
-            template.format(&ref_name, formatter.as_mut())?;
-        }
-
-        for &(remote, remote_ref) in &tracking_remote_refs {
-            let ref_name = RefName::remote(name, remote, remote_ref.clone(), local_target);
-            template.format(&ref_name, formatter.as_mut())?;
-        }
-
-        if local_target.is_absent() && !tracking_remote_refs.is_empty() {
-            found_deleted_local_branch = true;
-            found_deleted_tracking_local_branch |= tracking_remote_refs
-                .iter()
-                .any(|&(remote, _)| remote != git::REMOTE_NAME_FOR_LOCAL_GIT_REPO);
-        }
-
-        if args.all_remotes {
-            for &(remote, remote_ref) in &untracked_remote_refs {
-                let ref_name = RefName::remote_only(name, remote, remote_ref.target.clone());
-                template.format(&ref_name, formatter.as_mut())?;
-            }
-        }
-    }
-
-    drop(formatter);
-
-    // Print only one of these hints. It's not important to mention unexported
-    // branches, but user might wonder why deleted branches are still listed.
-    if found_deleted_tracking_local_branch {
-        if let Some(mut writer) = ui.hint_default() {
-            writeln!(
-                writer,
-                "Branches marked as deleted will be *deleted permanently* on the remote on the \
-                 next `jj git push`. Use `jj branch forget` to prevent this."
-            )?;
-        }
-    } else if found_deleted_local_branch {
-        if let Some(mut writer) = ui.hint_default() {
-            writeln!(
-                writer,
-                "Branches marked as deleted will be deleted from the underlying Git repo on the \
-                 next `jj git export`."
-            )?;
-        }
-    }
-
-    Ok(())
-}
diff --git a/cli/src/commands/branch/create.rs b/cli/src/commands/branch/create.rs
new file mode 100644
index 0000000000..6bdaaed3f9
--- /dev/null
+++ b/cli/src/commands/branch/create.rs
@@ -0,0 +1,86 @@
+// Copyright 2020-2023 The Jujutsu Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use clap::builder::NonEmptyStringValueParser;
+use jj_lib::object_id::ObjectId as _;
+use jj_lib::op_store::RefTarget;
+
+use super::has_tracked_remote_branches;
+use crate::cli_util::{CommandHelper, RevisionArg};
+use crate::command_error::{user_error_with_hint, CommandError};
+use crate::ui::Ui;
+
+/// Create a new branch
+#[derive(clap::Args, Clone, Debug)]
+pub struct BranchCreateArgs {
+    /// The branch's target revision
+    #[arg(long, short)]
+    revision: Option<RevisionArg>,
+
+    /// The branches to create
+    #[arg(required = true, value_parser = NonEmptyStringValueParser::new())]
+    names: Vec<String>,
+}
+
+pub fn cmd_branch_create(
+    ui: &mut Ui,
+    command: &CommandHelper,
+    args: &BranchCreateArgs,
+) -> Result<(), CommandError> {
+    let mut workspace_command = command.workspace_helper(ui)?;
+    let target_commit =
+        workspace_command.resolve_single_rev(args.revision.as_ref().unwrap_or(&RevisionArg::AT))?;
+    let view = workspace_command.repo().view();
+    let branch_names = &args.names;
+    for name in branch_names {
+        if view.get_local_branch(name).is_present() {
+            return Err(user_error_with_hint(
+                format!("Branch already exists: {name}"),
+                "Use `jj branch set` to update it.",
+            ));
+        }
+        if has_tracked_remote_branches(view, name) {
+            return Err(user_error_with_hint(
+                format!("Tracked remote branches exist for deleted branch: {name}"),
+                format!(
+                    "Use `jj branch set` to recreate the local branch. Run `jj branch untrack \
+                     'glob:{name}@*'` to disassociate them."
+                ),
+            ));
+        }
+    }
+
+    if branch_names.len() > 1 {
+        writeln!(
+            ui.warning_default(),
+            "Creating multiple branches: {}",
+            branch_names.join(", "),
+        )?;
+    }
+
+    let mut tx = workspace_command.start_transaction();
+    for branch_name in branch_names {
+        tx.mut_repo()
+            .set_local_branch_target(branch_name, RefTarget::normal(target_commit.id().clone()));
+    }
+    tx.finish(
+        ui,
+        format!(
+            "create branch {names} pointing to commit {id}",
+            names = branch_names.join(", "),
+            id = target_commit.id().hex()
+        ),
+    )?;
+    Ok(())
+}
diff --git a/cli/src/commands/branch/delete.rs b/cli/src/commands/branch/delete.rs
new file mode 100644
index 0000000000..c9d5700766
--- /dev/null
+++ b/cli/src/commands/branch/delete.rs
@@ -0,0 +1,61 @@
+// Copyright 2020-2023 The Jujutsu Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use itertools::Itertools as _;
+use jj_lib::op_store::RefTarget;
+use jj_lib::str_util::StringPattern;
+
+use super::find_local_branches;
+use crate::cli_util::CommandHelper;
+use crate::command_error::CommandError;
+use crate::ui::Ui;
+
+/// Delete an existing branch and propagate the deletion to remotes on the
+/// next push
+#[derive(clap::Args, Clone, Debug)]
+pub struct BranchDeleteArgs {
+    /// The branches to delete
+    ///
+    /// By default, the specified name matches exactly. Use `glob:` prefix to
+    /// select branches by wildcard pattern. For details, see
+    /// https://github.com/martinvonz/jj/blob/main/docs/revsets.md#string-patterns.
+    #[arg(required = true, value_parser = StringPattern::parse)]
+    names: Vec<StringPattern>,
+}
+
+pub fn cmd_branch_delete(
+    ui: &mut Ui,
+    command: &CommandHelper,
+    args: &BranchDeleteArgs,
+) -> Result<(), CommandError> {
+    let mut workspace_command = command.workspace_helper(ui)?;
+    let repo = workspace_command.repo().clone();
+    let matched_branches = find_local_branches(repo.view(), &args.names)?;
+    let mut tx = workspace_command.start_transaction();
+    for (name, _) in &matched_branches {
+        tx.mut_repo()
+            .set_local_branch_target(name, RefTarget::absent());
+    }
+    tx.finish(
+        ui,
+        format!(
+            "delete branch {}",
+            matched_branches.iter().map(|(name, _)| name).join(", ")
+        ),
+    )?;
+    if matched_branches.len() > 1 {
+        writeln!(ui.status(), "Deleted {} branches.", matched_branches.len())?;
+    }
+    Ok(())
+}
diff --git a/cli/src/commands/branch/forget.rs b/cli/src/commands/branch/forget.rs
new file mode 100644
index 0000000000..a0b3b05a56
--- /dev/null
+++ b/cli/src/commands/branch/forget.rs
@@ -0,0 +1,78 @@
+// Copyright 2020-2023 The Jujutsu Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use itertools::Itertools as _;
+use jj_lib::op_store::{BranchTarget, RefTarget, RemoteRef};
+use jj_lib::str_util::StringPattern;
+use jj_lib::view::View;
+
+use super::find_branches_with;
+use crate::cli_util::CommandHelper;
+use crate::command_error::CommandError;
+use crate::ui::Ui;
+
+/// Forget everything about a branch, including its local and remote
+/// targets
+///
+/// A forgotten branch will not impact remotes on future pushes. It will be
+/// recreated on future pulls if it still exists in the remote.
+#[derive(clap::Args, Clone, Debug)]
+pub struct BranchForgetArgs {
+    /// The branches to forget
+    ///
+    /// By default, the specified name matches exactly. Use `glob:` prefix to
+    /// select branches by wildcard pattern. For details, see
+    /// https://github.com/martinvonz/jj/blob/main/docs/revsets.md#string-patterns.
+    #[arg(required = true, value_parser = StringPattern::parse)]
+    names: Vec<StringPattern>,
+}
+
+pub fn cmd_branch_forget(
+    ui: &mut Ui,
+    command: &CommandHelper,
+    args: &BranchForgetArgs,
+) -> Result<(), CommandError> {
+    let mut workspace_command = command.workspace_helper(ui)?;
+    let repo = workspace_command.repo().clone();
+    let matched_branches = find_forgettable_branches(repo.view(), &args.names)?;
+    let mut tx = workspace_command.start_transaction();
+    for (name, branch_target) in &matched_branches {
+        tx.mut_repo()
+            .set_local_branch_target(name, RefTarget::absent());
+        for (remote_name, _) in &branch_target.remote_refs {
+            tx.mut_repo()
+                .set_remote_branch(name, remote_name, RemoteRef::absent());
+        }
+    }
+    tx.finish(
+        ui,
+        format!(
+            "forget branch {}",
+            matched_branches.iter().map(|(name, _)| name).join(", ")
+        ),
+    )?;
+    if matched_branches.len() > 1 {
+        writeln!(ui.status(), "Forgot {} branches.", matched_branches.len())?;
+    }
+    Ok(())
+}
+
+fn find_forgettable_branches<'a>(
+    view: &'a View,
+    name_patterns: &[StringPattern],
+) -> Result<Vec<(&'a str, BranchTarget<'a>)>, CommandError> {
+    find_branches_with(name_patterns, |pattern| {
+        view.branches().filter(|(name, _)| pattern.matches(name))
+    })
+}
diff --git a/cli/src/commands/branch/list.rs b/cli/src/commands/branch/list.rs
new file mode 100644
index 0000000000..150875cf14
--- /dev/null
+++ b/cli/src/commands/branch/list.rs
@@ -0,0 +1,199 @@
+// Copyright 2020-2023 The Jujutsu Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use std::collections::HashSet;
+
+use jj_lib::git;
+use jj_lib::revset::RevsetExpression;
+use jj_lib::str_util::StringPattern;
+
+use crate::cli_util::{CommandHelper, RevisionArg};
+use crate::command_error::CommandError;
+use crate::commit_templater::{CommitTemplateLanguage, RefName};
+use crate::ui::Ui;
+
+/// List branches and their targets
+///
+/// By default, a tracking remote branch will be included only if its target is
+/// different from the local target. A non-tracking remote branch won't be
+/// listed. For a conflicted branch (both local and remote), old target
+/// revisions are preceded by a "-" and new target revisions are preceded by a
+/// "+".
+///
+/// For information about branches, see
+/// https://github.com/martinvonz/jj/blob/main/docs/branches.md.
+#[derive(clap::Args, Clone, Debug)]
+pub struct BranchListArgs {
+    /// Show all tracking and non-tracking remote branches including the ones
+    /// whose targets are synchronized with the local branches
+    #[arg(long, short, alias = "all")]
+    all_remotes: bool,
+
+    /// Show remote tracked branches only. Omits local Git-tracking branches by
+    /// default
+    #[arg(long, short, conflicts_with_all = ["all_remotes"])]
+    tracked: bool,
+
+    /// Show conflicted branches only
+    #[arg(long, short, conflicts_with_all = ["all_remotes"])]
+    conflicted: bool,
+
+    /// Show branches whose local name matches
+    ///
+    /// By default, the specified name matches exactly. Use `glob:` prefix to
+    /// select branches by wildcard pattern. For details, see
+    /// https://github.com/martinvonz/jj/blob/main/docs/revsets.md#string-patterns.
+    #[arg(value_parser = StringPattern::parse)]
+    names: Vec<StringPattern>,
+
+    /// Show branches whose local targets are in the given revisions
+    ///
+    /// Note that `-r deleted_branch` will not work since `deleted_branch`
+    /// wouldn't have a local target.
+    #[arg(long, short)]
+    revisions: Vec<RevisionArg>,
+
+    /// Render each branch using the given template
+    ///
+    /// All 0-argument methods of the `RefName` type are available as keywords.
+    ///
+    /// For the syntax, see https://github.com/martinvonz/jj/blob/main/docs/templates.md
+    #[arg(long, short = 'T')]
+    template: Option<String>,
+}
+
+pub fn cmd_branch_list(
+    ui: &mut Ui,
+    command: &CommandHelper,
+    args: &BranchListArgs,
+) -> Result<(), CommandError> {
+    let workspace_command = command.workspace_helper(ui)?;
+    let repo = workspace_command.repo();
+    let view = repo.view();
+
+    // Like cmd_git_push(), names and revisions are OR-ed.
+    let branch_names_to_list = if !args.names.is_empty() || !args.revisions.is_empty() {
+        let mut branch_names: HashSet<&str> = HashSet::new();
+        if !args.names.is_empty() {
+            branch_names.extend(
+                view.branches()
+                    .filter(|&(name, _)| args.names.iter().any(|pattern| pattern.matches(name)))
+                    .map(|(name, _)| name),
+            );
+        }
+        if !args.revisions.is_empty() {
+            // Match against local targets only, which is consistent with "jj git push".
+            let mut expression = workspace_command.parse_union_revsets(&args.revisions)?;
+            // Intersects with the set of local branch targets to minimize the lookup space.
+            expression.intersect_with(&RevsetExpression::branches(StringPattern::everything()));
+            let filtered_targets: HashSet<_> = expression.evaluate_to_commit_ids()?.collect();
+            branch_names.extend(
+                view.local_branches()
+                    .filter(|(_, target)| {
+                        target.added_ids().any(|id| filtered_targets.contains(id))
+                    })
+                    .map(|(name, _)| name),
+            );
+        }
+        Some(branch_names)
+    } else {
+        None
+    };
+
+    let template = {
+        let language = workspace_command.commit_template_language()?;
+        let text = match &args.template {
+            Some(value) => value.to_owned(),
+            None => command.settings().config().get("templates.branch_list")?,
+        };
+        workspace_command
+            .parse_template(&language, &text, CommitTemplateLanguage::wrap_ref_name)?
+            .labeled("branch_list")
+    };
+
+    ui.request_pager();
+    let mut formatter = ui.stdout_formatter();
+
+    let mut found_deleted_local_branch = false;
+    let mut found_deleted_tracking_local_branch = false;
+    let branches_to_list = view.branches().filter(|(name, target)| {
+        branch_names_to_list
+            .as_ref()
+            .map_or(true, |branch_names| branch_names.contains(name))
+            && (!args.conflicted || target.local_target.has_conflict())
+    });
+    for (name, branch_target) in branches_to_list {
+        let local_target = branch_target.local_target;
+        let remote_refs = branch_target.remote_refs;
+        let (mut tracking_remote_refs, untracked_remote_refs) = remote_refs
+            .iter()
+            .copied()
+            .partition::<Vec<_>, _>(|&(_, remote_ref)| remote_ref.is_tracking());
+
+        if args.tracked {
+            tracking_remote_refs
+                .retain(|&(remote, _)| remote != git::REMOTE_NAME_FOR_LOCAL_GIT_REPO);
+        } else if !args.all_remotes {
+            tracking_remote_refs.retain(|&(_, remote_ref)| remote_ref.target != *local_target);
+        }
+
+        if !args.tracked && local_target.is_present() || !tracking_remote_refs.is_empty() {
+            let ref_name = RefName::local(
+                name,
+                local_target.clone(),
+                remote_refs.iter().map(|&(_, remote_ref)| remote_ref),
+            );
+            template.format(&ref_name, formatter.as_mut())?;
+        }
+
+        for &(remote, remote_ref) in &tracking_remote_refs {
+            let ref_name = RefName::remote(name, remote, remote_ref.clone(), local_target);
+            template.format(&ref_name, formatter.as_mut())?;
+        }
+
+        if local_target.is_absent() && !tracking_remote_refs.is_empty() {
+            found_deleted_local_branch = true;
+            found_deleted_tracking_local_branch |= tracking_remote_refs
+                .iter()
+                .any(|&(remote, _)| remote != git::REMOTE_NAME_FOR_LOCAL_GIT_REPO);
+        }
+
+        if args.all_remotes {
+            for &(remote, remote_ref) in &untracked_remote_refs {
+                let ref_name = RefName::remote_only(name, remote, remote_ref.target.clone());
+                template.format(&ref_name, formatter.as_mut())?;
+            }
+        }
+    }
+
+    drop(formatter);
+
+    // Print only one of these hints. It's not important to mention unexported
+    // branches, but user might wonder why deleted branches are still listed.
+    if found_deleted_tracking_local_branch {
+        writeln!(
+            ui.hint_default(),
+            "Branches marked as deleted will be *deleted permanently* on the remote on the next \
+             `jj git push`. Use `jj branch forget` to prevent this."
+        )?;
+    } else if found_deleted_local_branch {
+        writeln!(
+            ui.hint_default(),
+            "Branches marked as deleted will be deleted from the underlying Git repo on the next \
+             `jj git export`."
+        )?;
+    }
+
+    Ok(())
+}
diff --git a/cli/src/commands/branch/mod.rs b/cli/src/commands/branch/mod.rs
new file mode 100644
index 0000000000..70452c5f21
--- /dev/null
+++ b/cli/src/commands/branch/mod.rs
@@ -0,0 +1,179 @@
+// Copyright 2020-2023 The Jujutsu Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+mod create;
+mod delete;
+mod forget;
+mod list;
+mod r#move;
+mod rename;
+mod set;
+mod track;
+mod untrack;
+
+use itertools::Itertools as _;
+use jj_lib::backend::CommitId;
+use jj_lib::op_store::{RefTarget, RemoteRef};
+use jj_lib::repo::Repo;
+use jj_lib::str_util::StringPattern;
+use jj_lib::view::View;
+
+use self::create::{cmd_branch_create, BranchCreateArgs};
+use self::delete::{cmd_branch_delete, BranchDeleteArgs};
+use self::forget::{cmd_branch_forget, BranchForgetArgs};
+use self::list::{cmd_branch_list, BranchListArgs};
+use self::r#move::{cmd_branch_move, BranchMoveArgs};
+use self::rename::{cmd_branch_rename, BranchRenameArgs};
+use self::set::{cmd_branch_set, BranchSetArgs};
+use self::track::{cmd_branch_track, BranchTrackArgs};
+use self::untrack::{cmd_branch_untrack, BranchUntrackArgs};
+use crate::cli_util::{CommandHelper, RemoteBranchName, RemoteBranchNamePattern};
+use crate::command_error::{user_error, CommandError};
+use crate::ui::Ui;
+
+/// Manage branches
+///
+/// For information about branches, see
+/// https://github.com/martinvonz/jj/blob/main/docs/branches.md.
+#[derive(clap::Subcommand, Clone, Debug)]
+pub enum BranchCommand {
+    #[command(visible_alias("c"))]
+    Create(BranchCreateArgs),
+    #[command(visible_alias("d"))]
+    Delete(BranchDeleteArgs),
+    #[command(visible_alias("f"))]
+    Forget(BranchForgetArgs),
+    #[command(visible_alias("l"))]
+    List(BranchListArgs),
+    #[command(visible_alias("m"))]
+    Move(BranchMoveArgs),
+    #[command(visible_alias("r"))]
+    Rename(BranchRenameArgs),
+    #[command(visible_alias("s"))]
+    Set(BranchSetArgs),
+    #[command(visible_alias("t"))]
+    Track(BranchTrackArgs),
+    Untrack(BranchUntrackArgs),
+}
+
+pub fn cmd_branch(
+    ui: &mut Ui,
+    command: &CommandHelper,
+    subcommand: &BranchCommand,
+) -> Result<(), CommandError> {
+    match subcommand {
+        BranchCommand::Create(args) => cmd_branch_create(ui, command, args),
+        BranchCommand::Delete(args) => cmd_branch_delete(ui, command, args),
+        BranchCommand::Forget(args) => cmd_branch_forget(ui, command, args),
+        BranchCommand::List(args) => cmd_branch_list(ui, command, args),
+        BranchCommand::Move(args) => cmd_branch_move(ui, command, args),
+        BranchCommand::Rename(args) => cmd_branch_rename(ui, command, args),
+        BranchCommand::Set(args) => cmd_branch_set(ui, command, args),
+        BranchCommand::Track(args) => cmd_branch_track(ui, command, args),
+        BranchCommand::Untrack(args) => cmd_branch_untrack(ui, command, args),
+    }
+}
+
+fn find_local_branches<'a>(
+    view: &'a View,
+    name_patterns: &[StringPattern],
+) -> Result<Vec<(&'a str, &'a RefTarget)>, CommandError> {
+    find_branches_with(name_patterns, |pattern| {
+        view.local_branches_matching(pattern)
+    })
+}
+
+fn find_branches_with<'a, 'b, V, I: Iterator<Item = (&'a str, V)>>(
+    name_patterns: &'b [StringPattern],
+    mut find_matches: impl FnMut(&'b StringPattern) -> I,
+) -> Result<Vec<I::Item>, CommandError> {
+    let mut matching_branches: Vec<I::Item> = vec![];
+    let mut unmatched_patterns = vec![];
+    for pattern in name_patterns {
+        let mut matches = find_matches(pattern).peekable();
+        if matches.peek().is_none() {
+            unmatched_patterns.push(pattern);
+        }
+        matching_branches.extend(matches);
+    }
+    match &unmatched_patterns[..] {
+        [] => {
+            matching_branches.sort_unstable_by_key(|(name, _)| *name);
+            matching_branches.dedup_by_key(|(name, _)| *name);
+            Ok(matching_branches)
+        }
+        [pattern] if pattern.is_exact() => Err(user_error(format!("No such branch: {pattern}"))),
+        patterns => Err(user_error(format!(
+            "No matching branches for patterns: {}",
+            patterns.iter().join(", ")
+        ))),
+    }
+}
+
+fn find_remote_branches<'a>(
+    view: &'a View,
+    name_patterns: &[RemoteBranchNamePattern],
+) -> Result<Vec<(RemoteBranchName, &'a RemoteRef)>, CommandError> {
+    let mut matching_branches = vec![];
+    let mut unmatched_patterns = vec![];
+    for pattern in name_patterns {
+        let mut matches = view
+            .remote_branches_matching(&pattern.branch, &pattern.remote)
+            .map(|((branch, remote), remote_ref)| {
+                let name = RemoteBranchName {
+                    branch: branch.to_owned(),
+                    remote: remote.to_owned(),
+                };
+                (name, remote_ref)
+            })
+            .peekable();
+        if matches.peek().is_none() {
+            unmatched_patterns.push(pattern);
+        }
+        matching_branches.extend(matches);
+    }
+    match &unmatched_patterns[..] {
+        [] => {
+            matching_branches.sort_unstable_by(|(name1, _), (name2, _)| name1.cmp(name2));
+            matching_branches.dedup_by(|(name1, _), (name2, _)| name1 == name2);
+            Ok(matching_branches)
+        }
+        [pattern] if pattern.is_exact() => {
+            Err(user_error(format!("No such remote branch: {pattern}")))
+        }
+        patterns => Err(user_error(format!(
+            "No matching remote branches for patterns: {}",
+            patterns.iter().join(", ")
+        ))),
+    }
+}
+
+/// Whether or not the `branch` has any tracked remotes (i.e. is a tracking
+/// local branch.)
+fn has_tracked_remote_branches(view: &View, branch: &str) -> bool {
+    view.remote_branches_matching(&StringPattern::exact(branch), &StringPattern::everything())
+        .any(|(_, remote_ref)| remote_ref.is_tracking())
+}
+
+fn is_fast_forward(repo: &dyn Repo, old_target: &RefTarget, new_target_id: &CommitId) -> bool {
+    if old_target.is_present() {
+        // Strictly speaking, "all" old targets should be ancestors, but we allow
+        // conflict resolution by setting branch to "any" of the old target descendants.
+        old_target
+            .added_ids()
+            .any(|old| repo.index().is_ancestor(old, new_target_id))
+    } else {
+        true
+    }
+}
diff --git a/cli/src/commands/branch/move.rs b/cli/src/commands/branch/move.rs
new file mode 100644
index 0000000000..ac5b414212
--- /dev/null
+++ b/cli/src/commands/branch/move.rs
@@ -0,0 +1,135 @@
+// Copyright 2020-2023 The Jujutsu Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use itertools::Itertools as _;
+use jj_lib::backend::CommitId;
+use jj_lib::object_id::ObjectId as _;
+use jj_lib::op_store::RefTarget;
+use jj_lib::str_util::StringPattern;
+
+use super::{find_branches_with, is_fast_forward};
+use crate::cli_util::{CommandHelper, RevisionArg};
+use crate::command_error::{user_error_with_hint, CommandError};
+use crate::ui::Ui;
+
+/// Move existing branches to target revision
+///
+/// If branch names are given, the specified branches will be updated to point
+/// to the target revision.
+///
+/// If `--from` options are given, branches currently pointing to the specified
+/// revisions will be updated. The branches can also be filtered by names.
+///
+/// Example: pull up the nearest branches to the working-copy parent
+///
+/// $ jj branch move --from 'heads(::@- & branches())' --to @-
+#[derive(clap::Args, Clone, Debug)]
+#[command(group(clap::ArgGroup::new("source").multiple(true).required(true)))]
+pub struct BranchMoveArgs {
+    /// Move branches from the given revisions
+    #[arg(long, group = "source", value_name = "REVISIONS")]
+    from: Vec<RevisionArg>,
+
+    /// Move branches to this revision
+    #[arg(long, default_value = "@", value_name = "REVISION")]
+    to: RevisionArg,
+
+    /// Allow moving branches backwards or sideways
+    #[arg(long, short = 'B')]
+    allow_backwards: bool,
+
+    /// Move branches matching the given name patterns
+    ///
+    /// By default, the specified name matches exactly. Use `glob:` prefix to
+    /// select branches by wildcard pattern. For details, see
+    /// https://github.com/martinvonz/jj/blob/main/docs/revsets.md#string-patterns.
+    #[arg(group = "source", value_parser = StringPattern::parse)]
+    names: Vec<StringPattern>,
+}
+
+pub fn cmd_branch_move(
+    ui: &mut Ui,
+    command: &CommandHelper,
+    args: &BranchMoveArgs,
+) -> Result<(), CommandError> {
+    let mut workspace_command = command.workspace_helper(ui)?;
+    let repo = workspace_command.repo().clone();
+
+    let matched_branches = {
+        let is_source_commit = if !args.from.is_empty() {
+            workspace_command
+                .parse_union_revsets(&args.from)?
+                .evaluate()?
+                .containing_fn()
+        } else {
+            Box::new(|_: &CommitId| true)
+        };
+        if !args.names.is_empty() {
+            find_branches_with(&args.names, |pattern| {
+                repo.view()
+                    .local_branches_matching(pattern)
+                    .filter(|(_, target)| target.added_ids().any(&is_source_commit))
+            })?
+        } else {
+            repo.view()
+                .local_branches()
+                .filter(|(_, target)| target.added_ids().any(&is_source_commit))
+                .collect()
+        }
+    };
+    let target_commit = workspace_command.resolve_single_rev(&args.to)?;
+
+    if matched_branches.is_empty() {
+        writeln!(ui.status(), "No branches to update.")?;
+        return Ok(());
+    }
+    if matched_branches.len() > 1 {
+        writeln!(
+            ui.warning_default(),
+            "Updating multiple branches: {}",
+            matched_branches.iter().map(|(name, _)| name).join(", "),
+        )?;
+        if args.names.is_empty() {
+            writeln!(ui.hint_default(), "Specify branch by name to update one.")?;
+        }
+    }
+
+    if !args.allow_backwards {
+        if let Some((name, _)) = matched_branches
+            .iter()
+            .find(|(_, old_target)| !is_fast_forward(repo.as_ref(), old_target, target_commit.id()))
+        {
+            return Err(user_error_with_hint(
+                format!("Refusing to move branch backwards or sideways: {name}"),
+                "Use --allow-backwards to allow it.",
+            ));
+        }
+    }
+
+    let mut tx = workspace_command.start_transaction();
+    for (name, _) in &matched_branches {
+        tx.mut_repo()
+            .set_local_branch_target(name, RefTarget::normal(target_commit.id().clone()));
+    }
+    tx.finish(
+        ui,
+        format!(
+            "point branch {names} to commit {id}",
+            names = matched_branches.iter().map(|(name, _)| name).join(", "),
+            id = target_commit.id().hex()
+        ),
+    )?;
+
+    Ok(())
+}
diff --git a/cli/src/commands/branch/rename.rs b/cli/src/commands/branch/rename.rs
new file mode 100644
index 0000000000..4d2ae459e2
--- /dev/null
+++ b/cli/src/commands/branch/rename.rs
@@ -0,0 +1,87 @@
+// Copyright 2020-2023 The Jujutsu Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use jj_lib::op_store::RefTarget;
+
+use super::has_tracked_remote_branches;
+use crate::cli_util::CommandHelper;
+use crate::command_error::{user_error, CommandError};
+use crate::ui::Ui;
+
+/// Rename `old` branch name to `new` branch name
+///
+/// The new branch name points at the same commit as the old branch name.
+#[derive(clap::Args, Clone, Debug)]
+pub struct BranchRenameArgs {
+    /// The old name of the branch
+    old: String,
+
+    /// The new name of the branch
+    new: String,
+}
+
+pub fn cmd_branch_rename(
+    ui: &mut Ui,
+    command: &CommandHelper,
+    args: &BranchRenameArgs,
+) -> Result<(), CommandError> {
+    let mut workspace_command = command.workspace_helper(ui)?;
+    let view = workspace_command.repo().view();
+    let old_branch = &args.old;
+    let ref_target = view.get_local_branch(old_branch).clone();
+    if ref_target.is_absent() {
+        return Err(user_error(format!("No such branch: {old_branch}")));
+    }
+
+    let new_branch = &args.new;
+    if view.get_local_branch(new_branch).is_present() {
+        return Err(user_error(format!("Branch already exists: {new_branch}")));
+    }
+
+    let mut tx = workspace_command.start_transaction();
+    tx.mut_repo()
+        .set_local_branch_target(new_branch, ref_target);
+    tx.mut_repo()
+        .set_local_branch_target(old_branch, RefTarget::absent());
+    tx.finish(ui, format!("rename branch {old_branch} to {new_branch}"))?;
+
+    let view = workspace_command.repo().view();
+    if has_tracked_remote_branches(view, old_branch) {
+        writeln!(
+            ui.warning_default(),
+            "Tracked remote branches for branch {old_branch} were not renamed.",
+        )?;
+        writeln!(
+            ui.hint_default(),
+            "To rename the branch on the remote, you can `jj git push --branch {old_branch}` \
+             first (to delete it on the remote), and then `jj git push --branch {new_branch}`. \
+             `jj git push --all` would also be sufficient."
+        )?;
+    }
+    if has_tracked_remote_branches(view, new_branch) {
+        // This isn't an error because branch renaming can't be propagated to
+        // the remote immediately. "rename old new && rename new old" should be
+        // allowed even if the original old branch had tracked remotes.
+        writeln!(
+            ui.warning_default(),
+            "Tracked remote branches for branch {new_branch} exist."
+        )?;
+        writeln!(
+            ui.hint_default(),
+            "Run `jj branch untrack 'glob:{new_branch}@*'` to disassociate them."
+        )?;
+    }
+
+    Ok(())
+}
diff --git a/cli/src/commands/branch/set.rs b/cli/src/commands/branch/set.rs
new file mode 100644
index 0000000000..267e98b592
--- /dev/null
+++ b/cli/src/commands/branch/set.rs
@@ -0,0 +1,101 @@
+// Copyright 2020-2023 The Jujutsu Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use clap::builder::NonEmptyStringValueParser;
+use jj_lib::object_id::ObjectId as _;
+use jj_lib::op_store::RefTarget;
+
+use super::{has_tracked_remote_branches, is_fast_forward};
+use crate::cli_util::{CommandHelper, RevisionArg};
+use crate::command_error::{user_error_with_hint, CommandError};
+use crate::ui::Ui;
+
+/// Create or update a branch to point to a certain commit
+#[derive(clap::Args, Clone, Debug)]
+pub struct BranchSetArgs {
+    /// The branch's target revision
+    #[arg(long, short)]
+    revision: Option<RevisionArg>,
+
+    /// Allow moving the branch backwards or sideways
+    #[arg(long, short = 'B')]
+    allow_backwards: bool,
+
+    /// The branches to update
+    #[arg(required = true, value_parser = NonEmptyStringValueParser::new())]
+    names: Vec<String>,
+}
+
+pub fn cmd_branch_set(
+    ui: &mut Ui,
+    command: &CommandHelper,
+    args: &BranchSetArgs,
+) -> Result<(), CommandError> {
+    let mut workspace_command = command.workspace_helper(ui)?;
+    let target_commit =
+        workspace_command.resolve_single_rev(args.revision.as_ref().unwrap_or(&RevisionArg::AT))?;
+    let repo = workspace_command.repo().as_ref();
+    let branch_names = &args.names;
+    let mut new_branch_names: Vec<&str> = Vec::new();
+    for name in branch_names {
+        let old_target = repo.view().get_local_branch(name);
+        // If a branch is absent locally but is still tracking remote branches,
+        // we are resurrecting the local branch, not "creating" a new branch.
+        if old_target.is_absent() && !has_tracked_remote_branches(repo.view(), name) {
+            new_branch_names.push(name);
+        }
+        if !args.allow_backwards && !is_fast_forward(repo, old_target, target_commit.id()) {
+            return Err(user_error_with_hint(
+                format!("Refusing to move branch backwards or sideways: {name}"),
+                "Use --allow-backwards to allow it.",
+            ));
+        }
+    }
+
+    if branch_names.len() > 1 {
+        writeln!(
+            ui.warning_default(),
+            "Updating multiple branches: {}",
+            branch_names.join(", "),
+        )?;
+    }
+
+    let mut tx = workspace_command.start_transaction();
+    for branch_name in branch_names {
+        tx.mut_repo()
+            .set_local_branch_target(branch_name, RefTarget::normal(target_commit.id().clone()));
+    }
+    tx.finish(
+        ui,
+        format!(
+            "point branch {names} to commit {id}",
+            names = branch_names.join(", "),
+            id = target_commit.id().hex()
+        ),
+    )?;
+
+    if !new_branch_names.is_empty() {
+        writeln!(
+            ui.status(),
+            "Created branches: {}",
+            new_branch_names.join(", "),
+        )?;
+        // TODO: delete this hint in jj 0.25+
+        writeln!(
+            ui.hint_default(),
+            "Consider using `jj branch move` if your intention was to move existing branches."
+        )?;
+    }
+    Ok(())
+}
diff --git a/cli/src/commands/branch/track.rs b/cli/src/commands/branch/track.rs
new file mode 100644
index 0000000000..5dab3a29d0
--- /dev/null
+++ b/cli/src/commands/branch/track.rs
@@ -0,0 +1,127 @@
+// Copyright 2020-2023 The Jujutsu Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use std::collections::HashMap;
+
+use itertools::Itertools as _;
+
+use super::find_remote_branches;
+use crate::cli_util::{CommandHelper, RemoteBranchNamePattern};
+use crate::command_error::CommandError;
+use crate::commit_templater::{CommitTemplateLanguage, RefName};
+use crate::ui::Ui;
+
+/// Start tracking given remote branches
+///
+/// A tracking remote branch will be imported as a local branch of the same
+/// name. Changes to it will propagate to the existing local branch on future
+/// pulls.
+#[derive(clap::Args, Clone, Debug)]
+pub struct BranchTrackArgs {
+    /// Remote branches to track
+    ///
+    /// By default, the specified name matches exactly. Use `glob:` prefix to
+    /// select branches by wildcard pattern. For details, see
+    /// https://github.com/martinvonz/jj/blob/main/docs/revsets.md#string-patterns.
+    ///
+    /// Examples: branch@remote, glob:main@*, glob:jjfan-*@upstream
+    #[arg(required = true, value_name = "BRANCH@REMOTE")]
+    names: Vec<RemoteBranchNamePattern>,
+}
+
+pub fn cmd_branch_track(
+    ui: &mut Ui,
+    command: &CommandHelper,
+    args: &BranchTrackArgs,
+) -> Result<(), CommandError> {
+    let mut workspace_command = command.workspace_helper(ui)?;
+    let view = workspace_command.repo().view();
+    let mut names = Vec::new();
+    for (name, remote_ref) in find_remote_branches(view, &args.names)? {
+        if remote_ref.is_tracking() {
+            writeln!(
+                ui.warning_default(),
+                "Remote branch already tracked: {name}"
+            )?;
+        } else {
+            names.push(name);
+        }
+    }
+    let mut tx = workspace_command.start_transaction();
+    for name in &names {
+        tx.mut_repo()
+            .track_remote_branch(&name.branch, &name.remote);
+    }
+    tx.finish(
+        ui,
+        format!("track remote branch {}", names.iter().join(", ")),
+    )?;
+    if names.len() > 1 {
+        writeln!(
+            ui.status(),
+            "Started tracking {} remote branches.",
+            names.len()
+        )?;
+    }
+
+    //show conflicted branches if there are some
+
+    if let Some(mut formatter) = ui.status_formatter() {
+        let template = {
+            let language = workspace_command.commit_template_language()?;
+            let text = command
+                .settings()
+                .config()
+                .get::<String>("templates.branch_list")?;
+            workspace_command
+                .parse_template(&language, &text, CommitTemplateLanguage::wrap_ref_name)?
+                .labeled("branch_list")
+        };
+
+        let mut remote_per_branch: HashMap<&str, Vec<&str>> = HashMap::new();
+        for n in names.iter() {
+            remote_per_branch
+                .entry(&n.branch)
+                .or_default()
+                .push(&n.remote);
+        }
+        let branches_to_list =
+            workspace_command
+                .repo()
+                .view()
+                .branches()
+                .filter(|(name, target)| {
+                    remote_per_branch.contains_key(name) && target.local_target.has_conflict()
+                });
+
+        for (name, branch_target) in branches_to_list {
+            let local_target = branch_target.local_target;
+            let ref_name = RefName::local(
+                name,
+                local_target.clone(),
+                branch_target.remote_refs.iter().map(|x| x.1),
+            );
+            template.format(&ref_name, formatter.as_mut())?;
+
+            for (remote_name, remote_ref) in branch_target.remote_refs {
+                if remote_per_branch[name].contains(&remote_name) {
+                    let ref_name =
+                        RefName::remote(name, remote_name, remote_ref.clone(), local_target);
+                    template.format(&ref_name, formatter.as_mut())?;
+                }
+            }
+        }
+    }
+    Ok(())
+}
diff --git a/cli/src/commands/branch/untrack.rs b/cli/src/commands/branch/untrack.rs
new file mode 100644
index 0000000000..498ecfe29b
--- /dev/null
+++ b/cli/src/commands/branch/untrack.rs
@@ -0,0 +1,81 @@
+// Copyright 2020-2023 The Jujutsu Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use itertools::Itertools as _;
+use jj_lib::git;
+
+use super::find_remote_branches;
+use crate::cli_util::{CommandHelper, RemoteBranchNamePattern};
+use crate::command_error::CommandError;
+use crate::ui::Ui;
+
+/// Stop tracking given remote branches
+///
+/// A non-tracking remote branch is just a pointer to the last-fetched remote
+/// branch. It won't be imported as a local branch on future pulls.
+#[derive(clap::Args, Clone, Debug)]
+pub struct BranchUntrackArgs {
+    /// Remote branches to untrack
+    ///
+    /// By default, the specified name matches exactly. Use `glob:` prefix to
+    /// select branches by wildcard pattern. For details, see
+    /// https://github.com/martinvonz/jj/blob/main/docs/revsets.md#string-patterns.
+    ///
+    /// Examples: branch@remote, glob:main@*, glob:jjfan-*@upstream
+    #[arg(required = true, value_name = "BRANCH@REMOTE")]
+    names: Vec<RemoteBranchNamePattern>,
+}
+
+pub fn cmd_branch_untrack(
+    ui: &mut Ui,
+    command: &CommandHelper,
+    args: &BranchUntrackArgs,
+) -> Result<(), CommandError> {
+    let mut workspace_command = command.workspace_helper(ui)?;
+    let view = workspace_command.repo().view();
+    let mut names = Vec::new();
+    for (name, remote_ref) in find_remote_branches(view, &args.names)? {
+        if name.remote == git::REMOTE_NAME_FOR_LOCAL_GIT_REPO {
+            // This restriction can be lifted if we want to support untracked @git branches.
+            writeln!(
+                ui.warning_default(),
+                "Git-tracking branch cannot be untracked: {name}"
+            )?;
+        } else if !remote_ref.is_tracking() {
+            writeln!(
+                ui.warning_default(),
+                "Remote branch not tracked yet: {name}"
+            )?;
+        } else {
+            names.push(name);
+        }
+    }
+    let mut tx = workspace_command.start_transaction();
+    for name in &names {
+        tx.mut_repo()
+            .untrack_remote_branch(&name.branch, &name.remote);
+    }
+    tx.finish(
+        ui,
+        format!("untrack remote branch {}", names.iter().join(", ")),
+    )?;
+    if names.len() > 1 {
+        writeln!(
+            ui.status(),
+            "Stopped tracking {} remote branches.",
+            names.len()
+        )?;
+    }
+    Ok(())
+}
diff --git a/cli/src/commands/config.rs b/cli/src/commands/config.rs
index 46e13910a1..4c33a0021d 100644
--- a/cli/src/commands/config.rs
+++ b/cli/src/commands/config.rs
@@ -63,16 +63,16 @@ impl ConfigLevelArgs {
 /// config, see https://github.com/martinvonz/jj/blob/main/docs/config.md.
 #[derive(clap::Subcommand, Clone, Debug)]
 pub(crate) enum ConfigCommand {
-    #[command(visible_alias("l"))]
-    List(ConfigListArgs),
-    #[command(visible_alias("g"))]
-    Get(ConfigGetArgs),
-    #[command(visible_alias("s"))]
-    Set(ConfigSetArgs),
     #[command(visible_alias("e"))]
     Edit(ConfigEditArgs),
+    #[command(visible_alias("g"))]
+    Get(ConfigGetArgs),
+    #[command(visible_alias("l"))]
+    List(ConfigListArgs),
     #[command(visible_alias("p"))]
     Path(ConfigPathArgs),
+    #[command(visible_alias("s"))]
+    Set(ConfigSetArgs),
 }
 
 /// List variables set in config file, along with their values.
@@ -158,11 +158,11 @@ pub(crate) fn cmd_config(
     subcommand: &ConfigCommand,
 ) -> Result<(), CommandError> {
     match subcommand {
-        ConfigCommand::List(sub_args) => cmd_config_list(ui, command, sub_args),
-        ConfigCommand::Get(sub_args) => cmd_config_get(ui, command, sub_args),
-        ConfigCommand::Set(sub_args) => cmd_config_set(ui, command, sub_args),
-        ConfigCommand::Edit(sub_args) => cmd_config_edit(ui, command, sub_args),
-        ConfigCommand::Path(sub_args) => cmd_config_path(ui, command, sub_args),
+        ConfigCommand::Edit(args) => cmd_config_edit(ui, command, args),
+        ConfigCommand::Get(args) => cmd_config_get(ui, command, args),
+        ConfigCommand::List(args) => cmd_config_list(ui, command, args),
+        ConfigCommand::Path(args) => cmd_config_path(ui, command, args),
+        ConfigCommand::Set(args) => cmd_config_set(ui, command, args),
     }
 }
 
diff --git a/cli/src/commands/debug.rs b/cli/src/commands/debug.rs
deleted file mode 100644
index 79401c0cb1..0000000000
--- a/cli/src/commands/debug.rs
+++ /dev/null
@@ -1,441 +0,0 @@
-// Copyright 2023 The Jujutsu Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-use std::any::Any;
-use std::fmt::Debug;
-use std::io::Write as _;
-
-use clap::Subcommand;
-use jj_lib::backend::TreeId;
-use jj_lib::default_index::{AsCompositeIndex as _, DefaultIndexStore, DefaultReadonlyIndex};
-use jj_lib::local_working_copy::LocalWorkingCopy;
-use jj_lib::merged_tree::MergedTree;
-use jj_lib::object_id::ObjectId;
-use jj_lib::repo::Repo;
-use jj_lib::repo_path::RepoPathBuf;
-use jj_lib::working_copy::WorkingCopy;
-use jj_lib::{fileset, op_walk, revset};
-
-use crate::cli_util::{CommandHelper, RevisionArg};
-use crate::command_error::{internal_error, user_error, CommandError};
-use crate::ui::Ui;
-use crate::{revset_util, template_parser};
-
-/// Low-level commands not intended for users
-#[derive(Subcommand, Clone, Debug)]
-#[command(hide = true)]
-pub enum DebugCommand {
-    Fileset(DebugFilesetArgs),
-    Revset(DebugRevsetArgs),
-    #[command(name = "workingcopy")]
-    WorkingCopy(DebugWorkingCopyArgs),
-    Template(DebugTemplateArgs),
-    Index(DebugIndexArgs),
-    #[command(name = "reindex")]
-    ReIndex(DebugReIndexArgs),
-    #[command(visible_alias = "view")]
-    Operation(DebugOperationArgs),
-    Tree(DebugTreeArgs),
-    #[command(subcommand)]
-    Watchman(DebugWatchmanSubcommand),
-}
-
-/// Parse fileset expression
-#[derive(clap::Args, Clone, Debug)]
-pub struct DebugFilesetArgs {
-    #[arg(value_hint = clap::ValueHint::AnyPath)]
-    path: String,
-}
-
-/// Evaluate revset to full commit IDs
-#[derive(clap::Args, Clone, Debug)]
-pub struct DebugRevsetArgs {
-    revision: String,
-}
-
-/// Show information about the working copy state
-#[derive(clap::Args, Clone, Debug)]
-pub struct DebugWorkingCopyArgs {}
-
-/// Parse a template
-#[derive(clap::Args, Clone, Debug)]
-pub struct DebugTemplateArgs {
-    template: String,
-}
-
-/// Show commit index stats
-#[derive(clap::Args, Clone, Debug)]
-pub struct DebugIndexArgs {}
-
-/// Rebuild commit index
-#[derive(clap::Args, Clone, Debug)]
-pub struct DebugReIndexArgs {}
-
-/// Show information about an operation and its view
-#[derive(clap::Args, Clone, Debug)]
-pub struct DebugOperationArgs {
-    #[arg(default_value = "@")]
-    operation: String,
-    #[arg(long, value_enum, default_value = "all")]
-    display: DebugOperationDisplay,
-}
-
-#[derive(Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord, clap::ValueEnum)]
-pub enum DebugOperationDisplay {
-    /// Show only the operation details.
-    Operation,
-    /// Show the operation id only
-    Id,
-    /// Show only the view details
-    View,
-    /// Show both the view and the operation
-    All,
-}
-
-/// List the recursive entries of a tree.
-#[derive(clap::Args, Clone, Debug)]
-pub struct DebugTreeArgs {
-    #[arg(long, short = 'r')]
-    revision: Option<RevisionArg>,
-    #[arg(long, conflicts_with = "revision")]
-    id: Option<String>,
-    #[arg(long, requires = "id")]
-    dir: Option<String>,
-    paths: Vec<String>,
-    // TODO: Add an option to include trees that are ancestors of the matched paths
-}
-
-#[derive(Subcommand, Clone, Debug)]
-pub enum DebugWatchmanSubcommand {
-    /// Check whether `watchman` is enabled and whether it's correctly installed
-    Status,
-    QueryClock,
-    QueryChangedFiles,
-    ResetClock,
-}
-
-pub fn cmd_debug(
-    ui: &mut Ui,
-    command: &CommandHelper,
-    subcommand: &DebugCommand,
-) -> Result<(), CommandError> {
-    match subcommand {
-        DebugCommand::Fileset(args) => cmd_debug_fileset(ui, command, args),
-        DebugCommand::Revset(args) => cmd_debug_revset(ui, command, args),
-        DebugCommand::WorkingCopy(args) => cmd_debug_working_copy(ui, command, args),
-        DebugCommand::Template(args) => cmd_debug_template(ui, command, args),
-        DebugCommand::Index(args) => cmd_debug_index(ui, command, args),
-        DebugCommand::ReIndex(args) => cmd_debug_reindex(ui, command, args),
-        DebugCommand::Operation(args) => cmd_debug_operation(ui, command, args),
-        DebugCommand::Tree(args) => cmd_debug_tree(ui, command, args),
-        DebugCommand::Watchman(args) => cmd_debug_watchman(ui, command, args),
-    }
-}
-
-fn cmd_debug_fileset(
-    ui: &mut Ui,
-    command: &CommandHelper,
-    args: &DebugFilesetArgs,
-) -> Result<(), CommandError> {
-    let workspace_command = command.workspace_helper(ui)?;
-    let path_converter = workspace_command.path_converter();
-
-    let expression = fileset::parse_maybe_bare(&args.path, path_converter)?;
-    writeln!(ui.stdout(), "-- Parsed:")?;
-    writeln!(ui.stdout(), "{expression:#?}")?;
-    writeln!(ui.stdout())?;
-
-    let matcher = expression.to_matcher();
-    writeln!(ui.stdout(), "-- Matcher:")?;
-    writeln!(ui.stdout(), "{matcher:#?}")?;
-    Ok(())
-}
-
-fn cmd_debug_revset(
-    ui: &mut Ui,
-    command: &CommandHelper,
-    args: &DebugRevsetArgs,
-) -> Result<(), CommandError> {
-    let workspace_command = command.workspace_helper(ui)?;
-    let workspace_ctx = workspace_command.revset_parse_context();
-    let repo = workspace_command.repo().as_ref();
-
-    let expression = revset::parse(&args.revision, &workspace_ctx)?;
-    writeln!(ui.stdout(), "-- Parsed:")?;
-    writeln!(ui.stdout(), "{expression:#?}")?;
-    writeln!(ui.stdout())?;
-
-    let expression = revset::optimize(expression);
-    writeln!(ui.stdout(), "-- Optimized:")?;
-    writeln!(ui.stdout(), "{expression:#?}")?;
-    writeln!(ui.stdout())?;
-
-    let symbol_resolver = revset_util::default_symbol_resolver(
-        repo,
-        command.revset_extensions().symbol_resolvers(),
-        workspace_command.id_prefix_context()?,
-    );
-    let expression = expression.resolve_user_expression(repo, &symbol_resolver)?;
-    writeln!(ui.stdout(), "-- Resolved:")?;
-    writeln!(ui.stdout(), "{expression:#?}")?;
-    writeln!(ui.stdout())?;
-
-    let revset = expression.evaluate(repo)?;
-    writeln!(ui.stdout(), "-- Evaluated:")?;
-    writeln!(ui.stdout(), "{revset:#?}")?;
-    writeln!(ui.stdout())?;
-
-    writeln!(ui.stdout(), "-- Commit IDs:")?;
-    for commit_id in revset.iter() {
-        writeln!(ui.stdout(), "{}", commit_id.hex())?;
-    }
-    Ok(())
-}
-
-fn cmd_debug_working_copy(
-    ui: &mut Ui,
-    command: &CommandHelper,
-    _args: &DebugWorkingCopyArgs,
-) -> Result<(), CommandError> {
-    let workspace_command = command.workspace_helper(ui)?;
-    let wc = check_local_disk_wc(workspace_command.working_copy().as_any())?;
-    writeln!(ui.stdout(), "Current operation: {:?}", wc.operation_id())?;
-    writeln!(ui.stdout(), "Current tree: {:?}", wc.tree_id()?)?;
-    for (file, state) in wc.file_states()? {
-        writeln!(
-            ui.stdout(),
-            "{:?} {:13?} {:10?} {:?}",
-            state.file_type,
-            state.size,
-            state.mtime.0,
-            file
-        )?;
-    }
-    Ok(())
-}
-
-fn cmd_debug_template(
-    ui: &mut Ui,
-    _command: &CommandHelper,
-    args: &DebugTemplateArgs,
-) -> Result<(), CommandError> {
-    let node = template_parser::parse_template(&args.template)?;
-    writeln!(ui.stdout(), "{node:#?}")?;
-    Ok(())
-}
-
-fn cmd_debug_index(
-    ui: &mut Ui,
-    command: &CommandHelper,
-    _args: &DebugIndexArgs,
-) -> Result<(), CommandError> {
-    // Resolve the operation without loading the repo, so this command won't
-    // merge concurrent operations and update the index.
-    let workspace = command.load_workspace()?;
-    let repo_loader = workspace.repo_loader();
-    let op = op_walk::resolve_op_for_load(repo_loader, &command.global_args().at_operation)?;
-    let index_store = repo_loader.index_store();
-    let index = index_store
-        .get_index_at_op(&op, repo_loader.store())
-        .map_err(internal_error)?;
-    if let Some(default_index) = index.as_any().downcast_ref::<DefaultReadonlyIndex>() {
-        let stats = default_index.as_composite().stats();
-        writeln!(ui.stdout(), "Number of commits: {}", stats.num_commits)?;
-        writeln!(ui.stdout(), "Number of merges: {}", stats.num_merges)?;
-        writeln!(
-            ui.stdout(),
-            "Max generation number: {}",
-            stats.max_generation_number
-        )?;
-        writeln!(ui.stdout(), "Number of heads: {}", stats.num_heads)?;
-        writeln!(ui.stdout(), "Number of changes: {}", stats.num_changes)?;
-        writeln!(ui.stdout(), "Stats per level:")?;
-        for (i, level) in stats.levels.iter().enumerate() {
-            writeln!(ui.stdout(), "  Level {i}:")?;
-            writeln!(ui.stdout(), "    Number of commits: {}", level.num_commits)?;
-            writeln!(ui.stdout(), "    Name: {}", level.name.as_ref().unwrap())?;
-        }
-    } else {
-        return Err(user_error(format!(
-            "Cannot get stats for indexes of type '{}'",
-            index_store.name()
-        )));
-    }
-    Ok(())
-}
-
-fn cmd_debug_reindex(
-    ui: &mut Ui,
-    command: &CommandHelper,
-    _args: &DebugReIndexArgs,
-) -> Result<(), CommandError> {
-    // Resolve the operation without loading the repo. The index might have to
-    // be rebuilt while loading the repo.
-    let workspace = command.load_workspace()?;
-    let repo_loader = workspace.repo_loader();
-    let op = op_walk::resolve_op_for_load(repo_loader, &command.global_args().at_operation)?;
-    let index_store = repo_loader.index_store();
-    if let Some(default_index_store) = index_store.as_any().downcast_ref::<DefaultIndexStore>() {
-        default_index_store.reinit().map_err(internal_error)?;
-        let default_index = default_index_store
-            .build_index_at_operation(&op, repo_loader.store())
-            .map_err(internal_error)?;
-        writeln!(
-            ui.status(),
-            "Finished indexing {:?} commits.",
-            default_index.as_composite().stats().num_commits
-        )?;
-    } else {
-        return Err(user_error(format!(
-            "Cannot reindex indexes of type '{}'",
-            index_store.name()
-        )));
-    }
-    Ok(())
-}
-
-fn cmd_debug_operation(
-    ui: &mut Ui,
-    command: &CommandHelper,
-    args: &DebugOperationArgs,
-) -> Result<(), CommandError> {
-    // Resolve the operation without loading the repo, so this command can be used
-    // even if e.g. the view object is broken.
-    let workspace = command.load_workspace()?;
-    let repo_loader = workspace.repo_loader();
-    let op = op_walk::resolve_op_for_load(repo_loader, &args.operation)?;
-    if args.display == DebugOperationDisplay::Id {
-        writeln!(ui.stdout(), "{}", op.id().hex())?;
-        return Ok(());
-    }
-    if args.display != DebugOperationDisplay::View {
-        writeln!(ui.stdout(), "{:#?}", op.store_operation())?;
-    }
-    if args.display != DebugOperationDisplay::Operation {
-        writeln!(ui.stdout(), "{:#?}", op.view()?.store_view())?;
-    }
-    Ok(())
-}
-
-fn cmd_debug_tree(
-    ui: &mut Ui,
-    command: &CommandHelper,
-    args: &DebugTreeArgs,
-) -> Result<(), CommandError> {
-    let workspace_command = command.workspace_helper(ui)?;
-    let tree = if let Some(tree_id_hex) = &args.id {
-        let tree_id =
-            TreeId::try_from_hex(tree_id_hex).map_err(|_| user_error("Invalid tree id"))?;
-        let dir = if let Some(dir_str) = &args.dir {
-            workspace_command.parse_file_path(dir_str)?
-        } else {
-            RepoPathBuf::root()
-        };
-        let store = workspace_command.repo().store();
-        let tree = store.get_tree(&dir, &tree_id)?;
-        MergedTree::resolved(tree)
-    } else {
-        let commit = workspace_command
-            .resolve_single_rev(args.revision.as_ref().unwrap_or(&RevisionArg::AT))?;
-        commit.tree()?
-    };
-    let matcher = workspace_command
-        .parse_file_patterns(&args.paths)?
-        .to_matcher();
-    for (path, value) in tree.entries_matching(matcher.as_ref()) {
-        let ui_path = workspace_command.format_file_path(&path);
-        writeln!(ui.stdout(), "{ui_path}: {value:?}")?;
-    }
-
-    Ok(())
-}
-
-#[cfg(feature = "watchman")]
-fn cmd_debug_watchman(
-    ui: &mut Ui,
-    command: &CommandHelper,
-    subcommand: &DebugWatchmanSubcommand,
-) -> Result<(), CommandError> {
-    use jj_lib::local_working_copy::LockedLocalWorkingCopy;
-
-    let mut workspace_command = command.workspace_helper(ui)?;
-    let repo = workspace_command.repo().clone();
-    match subcommand {
-        DebugWatchmanSubcommand::Status => {
-            // TODO(ilyagr): It would be nice to add colors here
-            match command.settings().fsmonitor_kind()? {
-                jj_lib::fsmonitor::FsmonitorKind::Watchman => {
-                    writeln!(ui.stdout(), "Watchman is enabled via `core.fsmonitor`.")?
-                }
-                jj_lib::fsmonitor::FsmonitorKind::None => writeln!(
-                    ui.stdout(),
-                    "Watchman is disabled. Set `core.fsmonitor=\"watchman\"` to \
-                     enable.\nAttempting to contact the `watchman` CLI regardless..."
-                )?,
-                other_fsmonitor => {
-                    return Err(user_error(format!(
-                        "This command does not support the currently enabled filesystem monitor: \
-                         {other_fsmonitor:?}."
-                    )))
-                }
-            };
-            let wc = check_local_disk_wc(workspace_command.working_copy().as_any())?;
-            let _ = wc.query_watchman()?;
-            writeln!(
-                ui.stdout(),
-                "The watchman server seems to be installed and working correctly."
-            )?;
-        }
-        DebugWatchmanSubcommand::QueryClock => {
-            let wc = check_local_disk_wc(workspace_command.working_copy().as_any())?;
-            let (clock, _changed_files) = wc.query_watchman()?;
-            writeln!(ui.stdout(), "Clock: {clock:?}")?;
-        }
-        DebugWatchmanSubcommand::QueryChangedFiles => {
-            let wc = check_local_disk_wc(workspace_command.working_copy().as_any())?;
-            let (_clock, changed_files) = wc.query_watchman()?;
-            writeln!(ui.stdout(), "Changed files: {changed_files:?}")?;
-        }
-        DebugWatchmanSubcommand::ResetClock => {
-            let (mut locked_ws, _commit) = workspace_command.start_working_copy_mutation()?;
-            let Some(locked_local_wc): Option<&mut LockedLocalWorkingCopy> =
-                locked_ws.locked_wc().as_any_mut().downcast_mut()
-            else {
-                return Err(user_error(
-                    "This command requires a standard local-disk working copy",
-                ));
-            };
-            locked_local_wc.reset_watchman()?;
-            locked_ws.finish(repo.op_id().clone())?;
-            writeln!(ui.status(), "Reset Watchman clock")?;
-        }
-    }
-    Ok(())
-}
-
-#[cfg(not(feature = "watchman"))]
-fn cmd_debug_watchman(
-    _ui: &mut Ui,
-    _command: &CommandHelper,
-    _subcommand: &DebugWatchmanSubcommand,
-) -> Result<(), CommandError> {
-    Err(user_error(
-        "Cannot query Watchman because jj was not compiled with the `watchman` feature",
-    ))
-}
-
-fn check_local_disk_wc(x: &dyn Any) -> Result<&LocalWorkingCopy, CommandError> {
-    x.downcast_ref()
-        .ok_or_else(|| user_error("This command requires a standard local-disk working copy"))
-}
diff --git a/cli/src/commands/debug/fileset.rs b/cli/src/commands/debug/fileset.rs
new file mode 100644
index 0000000000..2d0468a94f
--- /dev/null
+++ b/cli/src/commands/debug/fileset.rs
@@ -0,0 +1,48 @@
+// Copyright 2023 The Jujutsu Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use std::fmt::Debug;
+use std::io::Write as _;
+
+use jj_lib::fileset;
+
+use crate::cli_util::CommandHelper;
+use crate::command_error::CommandError;
+use crate::ui::Ui;
+
+/// Parse fileset expression
+#[derive(clap::Args, Clone, Debug)]
+pub struct DebugFilesetArgs {
+    #[arg(value_hint = clap::ValueHint::AnyPath)]
+    path: String,
+}
+
+pub fn cmd_debug_fileset(
+    ui: &mut Ui,
+    command: &CommandHelper,
+    args: &DebugFilesetArgs,
+) -> Result<(), CommandError> {
+    let workspace_command = command.workspace_helper(ui)?;
+    let path_converter = workspace_command.path_converter();
+
+    let expression = fileset::parse_maybe_bare(&args.path, path_converter)?;
+    writeln!(ui.stdout(), "-- Parsed:")?;
+    writeln!(ui.stdout(), "{expression:#?}")?;
+    writeln!(ui.stdout())?;
+
+    let matcher = expression.to_matcher();
+    writeln!(ui.stdout(), "-- Matcher:")?;
+    writeln!(ui.stdout(), "{matcher:#?}")?;
+    Ok(())
+}
diff --git a/cli/src/commands/debug/index.rs b/cli/src/commands/debug/index.rs
new file mode 100644
index 0000000000..2c9eb06a68
--- /dev/null
+++ b/cli/src/commands/debug/index.rs
@@ -0,0 +1,67 @@
+// Copyright 2023 The Jujutsu Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use std::fmt::Debug;
+use std::io::Write as _;
+
+use jj_lib::default_index::{AsCompositeIndex as _, DefaultReadonlyIndex};
+use jj_lib::op_walk;
+
+use crate::cli_util::CommandHelper;
+use crate::command_error::{internal_error, user_error, CommandError};
+use crate::ui::Ui;
+
+/// Show commit index stats
+#[derive(clap::Args, Clone, Debug)]
+pub struct DebugIndexArgs {}
+
+pub fn cmd_debug_index(
+    ui: &mut Ui,
+    command: &CommandHelper,
+    _args: &DebugIndexArgs,
+) -> Result<(), CommandError> {
+    // Resolve the operation without loading the repo, so this command won't
+    // merge concurrent operations and update the index.
+    let workspace = command.load_workspace()?;
+    let repo_loader = workspace.repo_loader();
+    let op = op_walk::resolve_op_for_load(repo_loader, &command.global_args().at_operation)?;
+    let index_store = repo_loader.index_store();
+    let index = index_store
+        .get_index_at_op(&op, repo_loader.store())
+        .map_err(internal_error)?;
+    if let Some(default_index) = index.as_any().downcast_ref::<DefaultReadonlyIndex>() {
+        let stats = default_index.as_composite().stats();
+        writeln!(ui.stdout(), "Number of commits: {}", stats.num_commits)?;
+        writeln!(ui.stdout(), "Number of merges: {}", stats.num_merges)?;
+        writeln!(
+            ui.stdout(),
+            "Max generation number: {}",
+            stats.max_generation_number
+        )?;
+        writeln!(ui.stdout(), "Number of heads: {}", stats.num_heads)?;
+        writeln!(ui.stdout(), "Number of changes: {}", stats.num_changes)?;
+        writeln!(ui.stdout(), "Stats per level:")?;
+        for (i, level) in stats.levels.iter().enumerate() {
+            writeln!(ui.stdout(), "  Level {i}:")?;
+            writeln!(ui.stdout(), "    Number of commits: {}", level.num_commits)?;
+            writeln!(ui.stdout(), "    Name: {}", level.name.as_ref().unwrap())?;
+        }
+    } else {
+        return Err(user_error(format!(
+            "Cannot get stats for indexes of type '{}'",
+            index_store.name()
+        )));
+    }
+    Ok(())
+}
diff --git a/cli/src/commands/debug/local_working_copy.rs b/cli/src/commands/debug/local_working_copy.rs
new file mode 100644
index 0000000000..98408799b2
--- /dev/null
+++ b/cli/src/commands/debug/local_working_copy.rs
@@ -0,0 +1,51 @@
+// Copyright 2023 The Jujutsu Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use std::fmt::Debug;
+use std::io::Write as _;
+
+use jj_lib::working_copy::WorkingCopy;
+
+use super::check_local_disk_wc;
+use crate::cli_util::CommandHelper;
+use crate::command_error::CommandError;
+use crate::ui::Ui;
+
+/// Show information about the local working copy state
+///
+/// This command only works with a standard local-disk working copy.
+#[derive(clap::Args, Clone, Debug)]
+pub struct DebugLocalWorkingCopyArgs {}
+
+pub fn cmd_debug_local_working_copy(
+    ui: &mut Ui,
+    command: &CommandHelper,
+    _args: &DebugLocalWorkingCopyArgs,
+) -> Result<(), CommandError> {
+    let workspace_command = command.workspace_helper(ui)?;
+    let wc = check_local_disk_wc(workspace_command.working_copy().as_any())?;
+    writeln!(ui.stdout(), "Current operation: {:?}", wc.operation_id())?;
+    writeln!(ui.stdout(), "Current tree: {:?}", wc.tree_id()?)?;
+    for (file, state) in wc.file_states()? {
+        writeln!(
+            ui.stdout(),
+            "{:?} {:13?} {:10?} {:?}",
+            state.file_type,
+            state.size,
+            state.mtime.0,
+            file
+        )?;
+    }
+    Ok(())
+}
diff --git a/cli/src/commands/debug/mod.rs b/cli/src/commands/debug/mod.rs
new file mode 100644
index 0000000000..97138e2faf
--- /dev/null
+++ b/cli/src/commands/debug/mod.rs
@@ -0,0 +1,90 @@
+// Copyright 2023 The Jujutsu Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+pub mod fileset;
+pub mod index;
+pub mod local_working_copy;
+pub mod operation;
+pub mod reindex;
+pub mod revset;
+pub mod snapshot;
+pub mod template;
+pub mod tree;
+pub mod watchman;
+pub mod working_copy;
+
+use std::any::Any;
+use std::fmt::Debug;
+
+use clap::Subcommand;
+use jj_lib::local_working_copy::LocalWorkingCopy;
+
+use self::fileset::{cmd_debug_fileset, DebugFilesetArgs};
+use self::index::{cmd_debug_index, DebugIndexArgs};
+use self::local_working_copy::{cmd_debug_local_working_copy, DebugLocalWorkingCopyArgs};
+use self::operation::{cmd_debug_operation, DebugOperationArgs};
+use self::reindex::{cmd_debug_reindex, DebugReindexArgs};
+use self::revset::{cmd_debug_revset, DebugRevsetArgs};
+use self::snapshot::{cmd_debug_snapshot, DebugSnapshotArgs};
+use self::template::{cmd_debug_template, DebugTemplateArgs};
+use self::tree::{cmd_debug_tree, DebugTreeArgs};
+use self::watchman::{cmd_debug_watchman, DebugWatchmanCommand};
+use self::working_copy::{cmd_debug_working_copy, DebugWorkingCopyArgs};
+use crate::cli_util::CommandHelper;
+use crate::command_error::{user_error, CommandError};
+use crate::ui::Ui;
+
+/// Low-level commands not intended for users
+#[derive(Subcommand, Clone, Debug)]
+#[command(hide = true)]
+pub enum DebugCommand {
+    Fileset(DebugFilesetArgs),
+    Index(DebugIndexArgs),
+    LocalWorkingCopy(DebugLocalWorkingCopyArgs),
+    #[command(visible_alias = "view")]
+    Operation(DebugOperationArgs),
+    Reindex(DebugReindexArgs),
+    Revset(DebugRevsetArgs),
+    Snapshot(DebugSnapshotArgs),
+    Template(DebugTemplateArgs),
+    Tree(DebugTreeArgs),
+    #[command(subcommand)]
+    Watchman(DebugWatchmanCommand),
+    WorkingCopy(DebugWorkingCopyArgs),
+}
+
+pub fn cmd_debug(
+    ui: &mut Ui,
+    command: &CommandHelper,
+    subcommand: &DebugCommand,
+) -> Result<(), CommandError> {
+    match subcommand {
+        DebugCommand::Fileset(args) => cmd_debug_fileset(ui, command, args),
+        DebugCommand::Index(args) => cmd_debug_index(ui, command, args),
+        DebugCommand::LocalWorkingCopy(args) => cmd_debug_local_working_copy(ui, command, args),
+        DebugCommand::Operation(args) => cmd_debug_operation(ui, command, args),
+        DebugCommand::Reindex(args) => cmd_debug_reindex(ui, command, args),
+        DebugCommand::Revset(args) => cmd_debug_revset(ui, command, args),
+        DebugCommand::Snapshot(args) => cmd_debug_snapshot(ui, command, args),
+        DebugCommand::Template(args) => cmd_debug_template(ui, command, args),
+        DebugCommand::Tree(args) => cmd_debug_tree(ui, command, args),
+        DebugCommand::Watchman(args) => cmd_debug_watchman(ui, command, args),
+        DebugCommand::WorkingCopy(args) => cmd_debug_working_copy(ui, command, args),
+    }
+}
+
+fn check_local_disk_wc(x: &dyn Any) -> Result<&LocalWorkingCopy, CommandError> {
+    x.downcast_ref()
+        .ok_or_else(|| user_error("This command requires a standard local-disk working copy"))
+}
diff --git a/cli/src/commands/debug/operation.rs b/cli/src/commands/debug/operation.rs
new file mode 100644
index 0000000000..ccf3fdec53
--- /dev/null
+++ b/cli/src/commands/debug/operation.rs
@@ -0,0 +1,67 @@
+// Copyright 2023 The Jujutsu Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use std::fmt::Debug;
+use std::io::Write as _;
+
+use jj_lib::object_id::ObjectId;
+use jj_lib::op_walk;
+
+use crate::cli_util::CommandHelper;
+use crate::command_error::CommandError;
+use crate::ui::Ui;
+
+/// Show information about an operation and its view
+#[derive(clap::Args, Clone, Debug)]
+pub struct DebugOperationArgs {
+    #[arg(default_value = "@")]
+    operation: String,
+    #[arg(long, value_enum, default_value = "all")]
+    display: OperationDisplay,
+}
+
+#[derive(Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord, clap::ValueEnum)]
+pub enum OperationDisplay {
+    /// Show only the operation details.
+    Operation,
+    /// Show the operation id only
+    Id,
+    /// Show only the view details
+    View,
+    /// Show both the view and the operation
+    All,
+}
+
+pub fn cmd_debug_operation(
+    ui: &mut Ui,
+    command: &CommandHelper,
+    args: &DebugOperationArgs,
+) -> Result<(), CommandError> {
+    // Resolve the operation without loading the repo, so this command can be used
+    // even if e.g. the view object is broken.
+    let workspace = command.load_workspace()?;
+    let repo_loader = workspace.repo_loader();
+    let op = op_walk::resolve_op_for_load(repo_loader, &args.operation)?;
+    if args.display == OperationDisplay::Id {
+        writeln!(ui.stdout(), "{}", op.id().hex())?;
+        return Ok(());
+    }
+    if args.display != OperationDisplay::View {
+        writeln!(ui.stdout(), "{:#?}", op.store_operation())?;
+    }
+    if args.display != OperationDisplay::Operation {
+        writeln!(ui.stdout(), "{:#?}", op.view()?.store_view())?;
+    }
+    Ok(())
+}
diff --git a/cli/src/commands/debug/reindex.rs b/cli/src/commands/debug/reindex.rs
new file mode 100644
index 0000000000..02ecc6f009
--- /dev/null
+++ b/cli/src/commands/debug/reindex.rs
@@ -0,0 +1,57 @@
+// Copyright 2023 The Jujutsu Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use std::fmt::Debug;
+use std::io::Write as _;
+
+use jj_lib::default_index::{AsCompositeIndex as _, DefaultIndexStore};
+use jj_lib::op_walk;
+
+use crate::cli_util::CommandHelper;
+use crate::command_error::{internal_error, user_error, CommandError};
+use crate::ui::Ui;
+
+/// Rebuild commit index
+#[derive(clap::Args, Clone, Debug)]
+pub struct DebugReindexArgs {}
+
+pub fn cmd_debug_reindex(
+    ui: &mut Ui,
+    command: &CommandHelper,
+    _args: &DebugReindexArgs,
+) -> Result<(), CommandError> {
+    // Resolve the operation without loading the repo. The index might have to
+    // be rebuilt while loading the repo.
+    let workspace = command.load_workspace()?;
+    let repo_loader = workspace.repo_loader();
+    let op = op_walk::resolve_op_for_load(repo_loader, &command.global_args().at_operation)?;
+    let index_store = repo_loader.index_store();
+    if let Some(default_index_store) = index_store.as_any().downcast_ref::<DefaultIndexStore>() {
+        default_index_store.reinit().map_err(internal_error)?;
+        let default_index = default_index_store
+            .build_index_at_operation(&op, repo_loader.store())
+            .map_err(internal_error)?;
+        writeln!(
+            ui.status(),
+            "Finished indexing {:?} commits.",
+            default_index.as_composite().stats().num_commits
+        )?;
+    } else {
+        return Err(user_error(format!(
+            "Cannot reindex indexes of type '{}'",
+            index_store.name()
+        )));
+    }
+    Ok(())
+}
diff --git a/cli/src/commands/debug/revset.rs b/cli/src/commands/debug/revset.rs
new file mode 100644
index 0000000000..5a91d36c08
--- /dev/null
+++ b/cli/src/commands/debug/revset.rs
@@ -0,0 +1,71 @@
+// Copyright 2023 The Jujutsu Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use std::fmt::Debug;
+use std::io::Write as _;
+
+use jj_lib::object_id::ObjectId;
+use jj_lib::revset;
+
+use crate::cli_util::CommandHelper;
+use crate::command_error::CommandError;
+use crate::revset_util;
+use crate::ui::Ui;
+
+/// Evaluate revset to full commit IDs
+#[derive(clap::Args, Clone, Debug)]
+pub struct DebugRevsetArgs {
+    revision: String,
+}
+
+pub fn cmd_debug_revset(
+    ui: &mut Ui,
+    command: &CommandHelper,
+    args: &DebugRevsetArgs,
+) -> Result<(), CommandError> {
+    let workspace_command = command.workspace_helper(ui)?;
+    let workspace_ctx = workspace_command.revset_parse_context();
+    let repo = workspace_command.repo().as_ref();
+
+    let expression = revset::parse(&args.revision, &workspace_ctx)?;
+    writeln!(ui.stdout(), "-- Parsed:")?;
+    writeln!(ui.stdout(), "{expression:#?}")?;
+    writeln!(ui.stdout())?;
+
+    let expression = revset::optimize(expression);
+    writeln!(ui.stdout(), "-- Optimized:")?;
+    writeln!(ui.stdout(), "{expression:#?}")?;
+    writeln!(ui.stdout())?;
+
+    let symbol_resolver = revset_util::default_symbol_resolver(
+        repo,
+        command.revset_extensions().symbol_resolvers(),
+        workspace_command.id_prefix_context()?,
+    );
+    let expression = expression.resolve_user_expression(repo, &symbol_resolver)?;
+    writeln!(ui.stdout(), "-- Resolved:")?;
+    writeln!(ui.stdout(), "{expression:#?}")?;
+    writeln!(ui.stdout())?;
+
+    let revset = expression.evaluate(repo)?;
+    writeln!(ui.stdout(), "-- Evaluated:")?;
+    writeln!(ui.stdout(), "{revset:#?}")?;
+    writeln!(ui.stdout())?;
+
+    writeln!(ui.stdout(), "-- Commit IDs:")?;
+    for commit_id in revset.iter() {
+        writeln!(ui.stdout(), "{}", commit_id.hex())?;
+    }
+    Ok(())
+}
diff --git a/cli/src/commands/debug/snapshot.rs b/cli/src/commands/debug/snapshot.rs
new file mode 100644
index 0000000000..629129da67
--- /dev/null
+++ b/cli/src/commands/debug/snapshot.rs
@@ -0,0 +1,33 @@
+// Copyright 2024 The Jujutsu Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use std::fmt::Debug;
+
+use crate::cli_util::CommandHelper;
+use crate::command_error::CommandError;
+use crate::ui::Ui;
+
+/// Trigger a snapshot in the op log
+#[derive(clap::Args, Clone, Debug)]
+pub struct DebugSnapshotArgs {}
+
+pub fn cmd_debug_snapshot(
+    ui: &mut Ui,
+    command: &CommandHelper,
+    _args: &DebugSnapshotArgs,
+) -> Result<(), CommandError> {
+    // workspace helper will snapshot as needed
+    command.workspace_helper(ui)?;
+    Ok(())
+}
diff --git a/cli/src/commands/debug/template.rs b/cli/src/commands/debug/template.rs
new file mode 100644
index 0000000000..1af2f4aeda
--- /dev/null
+++ b/cli/src/commands/debug/template.rs
@@ -0,0 +1,37 @@
+// Copyright 2023 The Jujutsu Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use std::fmt::Debug;
+use std::io::Write as _;
+
+use crate::cli_util::CommandHelper;
+use crate::command_error::CommandError;
+use crate::template_parser;
+use crate::ui::Ui;
+
+/// Parse a template
+#[derive(clap::Args, Clone, Debug)]
+pub struct DebugTemplateArgs {
+    template: String,
+}
+
+pub fn cmd_debug_template(
+    ui: &mut Ui,
+    _command: &CommandHelper,
+    args: &DebugTemplateArgs,
+) -> Result<(), CommandError> {
+    let node = template_parser::parse_template(&args.template)?;
+    writeln!(ui.stdout(), "{node:#?}")?;
+    Ok(())
+}
diff --git a/cli/src/commands/debug/tree.rs b/cli/src/commands/debug/tree.rs
new file mode 100644
index 0000000000..17ee28aa55
--- /dev/null
+++ b/cli/src/commands/debug/tree.rs
@@ -0,0 +1,71 @@
+// Copyright 2023 The Jujutsu Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use std::fmt::Debug;
+use std::io::Write as _;
+
+use jj_lib::backend::TreeId;
+use jj_lib::merged_tree::MergedTree;
+use jj_lib::repo::Repo;
+use jj_lib::repo_path::RepoPathBuf;
+
+use crate::cli_util::{CommandHelper, RevisionArg};
+use crate::command_error::{user_error, CommandError};
+use crate::ui::Ui;
+
+/// List the recursive entries of a tree.
+#[derive(clap::Args, Clone, Debug)]
+pub struct DebugTreeArgs {
+    #[arg(long, short = 'r')]
+    revision: Option<RevisionArg>,
+    #[arg(long, conflicts_with = "revision")]
+    id: Option<String>,
+    #[arg(long, requires = "id")]
+    dir: Option<String>,
+    paths: Vec<String>,
+    // TODO: Add an option to include trees that are ancestors of the matched paths
+}
+
+pub fn cmd_debug_tree(
+    ui: &mut Ui,
+    command: &CommandHelper,
+    args: &DebugTreeArgs,
+) -> Result<(), CommandError> {
+    let workspace_command = command.workspace_helper(ui)?;
+    let tree = if let Some(tree_id_hex) = &args.id {
+        let tree_id =
+            TreeId::try_from_hex(tree_id_hex).map_err(|_| user_error("Invalid tree id"))?;
+        let dir = if let Some(dir_str) = &args.dir {
+            workspace_command.parse_file_path(dir_str)?
+        } else {
+            RepoPathBuf::root()
+        };
+        let store = workspace_command.repo().store();
+        let tree = store.get_tree(&dir, &tree_id)?;
+        MergedTree::resolved(tree)
+    } else {
+        let commit = workspace_command
+            .resolve_single_rev(args.revision.as_ref().unwrap_or(&RevisionArg::AT))?;
+        commit.tree()?
+    };
+    let matcher = workspace_command
+        .parse_file_patterns(&args.paths)?
+        .to_matcher();
+    for (path, value) in tree.entries_matching(matcher.as_ref()) {
+        let ui_path = workspace_command.format_file_path(&path);
+        writeln!(ui.stdout(), "{ui_path}: {value:?}")?;
+    }
+
+    Ok(())
+}
diff --git a/cli/src/commands/debug/watchman.rs b/cli/src/commands/debug/watchman.rs
new file mode 100644
index 0000000000..322cf8743d
--- /dev/null
+++ b/cli/src/commands/debug/watchman.rs
@@ -0,0 +1,137 @@
+// Copyright 2023 The Jujutsu Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use std::any::Any;
+use std::fmt::Debug;
+use std::io::Write as _;
+
+use clap::Subcommand;
+use jj_lib::fsmonitor::{FsmonitorSettings, WatchmanConfig};
+use jj_lib::local_working_copy::LocalWorkingCopy;
+
+use crate::cli_util::CommandHelper;
+use crate::command_error::{user_error, CommandError};
+use crate::ui::Ui;
+
+#[derive(Subcommand, Clone, Debug)]
+pub enum DebugWatchmanCommand {
+    /// Check whether `watchman` is enabled and whether it's correctly installed
+    Status,
+    QueryClock,
+    QueryChangedFiles,
+    ResetClock,
+}
+
+#[cfg(feature = "watchman")]
+pub fn cmd_debug_watchman(
+    ui: &mut Ui,
+    command: &CommandHelper,
+    subcommand: &DebugWatchmanCommand,
+) -> Result<(), CommandError> {
+    use jj_lib::local_working_copy::LockedLocalWorkingCopy;
+
+    let mut workspace_command = command.workspace_helper(ui)?;
+    let repo = workspace_command.repo().clone();
+    match subcommand {
+        DebugWatchmanCommand::Status => {
+            // TODO(ilyagr): It would be nice to add colors here
+            let config = match command.settings().fsmonitor_settings()? {
+                FsmonitorSettings::Watchman(config) => {
+                    writeln!(ui.stdout(), "Watchman is enabled via `core.fsmonitor`.")?;
+                    writeln!(
+                        ui.stdout(),
+                        r"Background snapshotting is {}. Use `core.watchman.register_snapshot_trigger` to control it.",
+                        if config.register_trigger {
+                            "enabled"
+                        } else {
+                            "disabled"
+                        }
+                    )?;
+                    config
+                }
+                FsmonitorSettings::None => {
+                    writeln!(
+                        ui.stdout(),
+                        r#"Watchman is disabled. Set `core.fsmonitor="watchman"` to enable."#
+                    )?;
+                    writeln!(
+                        ui.stdout(),
+                        "Attempting to contact the `watchman` CLI regardless..."
+                    )?;
+                    WatchmanConfig::default()
+                }
+                other_fsmonitor => {
+                    return Err(user_error(format!(
+                        r"This command does not support the currently enabled filesystem monitor: {other_fsmonitor:?}."
+                    )))
+                }
+            };
+            let wc = check_local_disk_wc(workspace_command.working_copy().as_any())?;
+            let _ = wc.query_watchman(&config)?;
+            writeln!(
+                ui.stdout(),
+                "The watchman server seems to be installed and working correctly."
+            )?;
+            writeln!(
+                ui.stdout(),
+                "Background snapshotting is currently {}.",
+                if wc.is_watchman_trigger_registered(&config)? {
+                    "active"
+                } else {
+                    "inactive"
+                }
+            )?;
+        }
+        DebugWatchmanCommand::QueryClock => {
+            let wc = check_local_disk_wc(workspace_command.working_copy().as_any())?;
+            let (clock, _changed_files) = wc.query_watchman(&WatchmanConfig::default())?;
+            writeln!(ui.stdout(), "Clock: {clock:?}")?;
+        }
+        DebugWatchmanCommand::QueryChangedFiles => {
+            let wc = check_local_disk_wc(workspace_command.working_copy().as_any())?;
+            let (_clock, changed_files) = wc.query_watchman(&WatchmanConfig::default())?;
+            writeln!(ui.stdout(), "Changed files: {changed_files:?}")?;
+        }
+        DebugWatchmanCommand::ResetClock => {
+            let (mut locked_ws, _commit) = workspace_command.start_working_copy_mutation()?;
+            let Some(locked_local_wc): Option<&mut LockedLocalWorkingCopy> =
+                locked_ws.locked_wc().as_any_mut().downcast_mut()
+            else {
+                return Err(user_error(
+                    "This command requires a standard local-disk working copy",
+                ));
+            };
+            locked_local_wc.reset_watchman()?;
+            locked_ws.finish(repo.op_id().clone())?;
+            writeln!(ui.status(), "Reset Watchman clock")?;
+        }
+    }
+    Ok(())
+}
+
+#[cfg(not(feature = "watchman"))]
+pub fn cmd_debug_watchman(
+    _ui: &mut Ui,
+    _command: &CommandHelper,
+    _subcommand: &DebugWatchmanCommand,
+) -> Result<(), CommandError> {
+    Err(user_error(
+        "Cannot query Watchman because jj was not compiled with the `watchman` feature",
+    ))
+}
+
+fn check_local_disk_wc(x: &dyn Any) -> Result<&LocalWorkingCopy, CommandError> {
+    x.downcast_ref()
+        .ok_or_else(|| user_error("This command requires a standard local-disk working copy"))
+}
diff --git a/cli/src/commands/debug/working_copy.rs b/cli/src/commands/debug/working_copy.rs
new file mode 100644
index 0000000000..0cf42c537e
--- /dev/null
+++ b/cli/src/commands/debug/working_copy.rs
@@ -0,0 +1,37 @@
+// Copyright 2023 The Jujutsu Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use std::fmt::Debug;
+use std::io::Write as _;
+
+use crate::cli_util::CommandHelper;
+use crate::command_error::CommandError;
+use crate::ui::Ui;
+
+/// Show information about the working copy state
+#[derive(clap::Args, Clone, Debug)]
+pub struct DebugWorkingCopyArgs {}
+
+pub fn cmd_debug_working_copy(
+    ui: &mut Ui,
+    command: &CommandHelper,
+    _args: &DebugWorkingCopyArgs,
+) -> Result<(), CommandError> {
+    let workspace_command = command.workspace_helper_no_snapshot(ui)?;
+    let wc = workspace_command.working_copy();
+    writeln!(ui.stdout(), "Type: {:?}", wc.name())?;
+    writeln!(ui.stdout(), "Current operation: {:?}", wc.operation_id())?;
+    writeln!(ui.stdout(), "Current tree: {:?}", wc.tree_id()?)?;
+    Ok(())
+}
diff --git a/cli/src/commands/chmod.rs b/cli/src/commands/file/chmod.rs
similarity index 86%
rename from cli/src/commands/chmod.rs
rename to cli/src/commands/file/chmod.rs
index 1bc29aa05c..bf4b844692 100644
--- a/cli/src/commands/chmod.rs
+++ b/cli/src/commands/file/chmod.rs
@@ -34,10 +34,10 @@ enum ChmodMode {
 
 /// Sets or removes the executable bit for paths in the repo
 ///
-/// Unlike the POSIX `chmod`, `jj chmod` also works on Windows, on conflicted
-/// files, and on arbitrary revisions.
+/// Unlike the POSIX `chmod`, `jj file chmod` also works on Windows, on
+/// conflicted files, and on arbitrary revisions.
 #[derive(clap::Args, Clone, Debug)]
-pub(crate) struct ChmodArgs {
+pub(crate) struct FileChmodArgs {
     mode: ChmodMode,
     /// The revision to update
     #[arg(long, short, default_value = "@")]
@@ -48,10 +48,27 @@ pub(crate) struct ChmodArgs {
 }
 
 #[instrument(skip_all)]
-pub(crate) fn cmd_chmod(
+pub(crate) fn deprecated_cmd_chmod(
     ui: &mut Ui,
     command: &CommandHelper,
-    args: &ChmodArgs,
+    args: &FileChmodArgs,
+) -> Result<(), CommandError> {
+    writeln!(
+        ui.warning_default(),
+        "`jj chmod` is deprecated; use `jj file chmod` instead, which is equivalent"
+    )?;
+    writeln!(
+        ui.warning_default(),
+        "`jj chmod` will be removed in a future version, and this will be a hard error"
+    )?;
+    cmd_file_chmod(ui, command, args)
+}
+
+#[instrument(skip_all)]
+pub(crate) fn cmd_file_chmod(
+    ui: &mut Ui,
+    command: &CommandHelper,
+    args: &FileChmodArgs,
 ) -> Result<(), CommandError> {
     let executable_bit = match args.mode {
         ChmodMode::Executable => true,
diff --git a/cli/src/commands/files.rs b/cli/src/commands/file/list.rs
similarity index 74%
rename from cli/src/commands/files.rs
rename to cli/src/commands/file/list.rs
index 5b836795ae..e0d2b08263 100644
--- a/cli/src/commands/files.rs
+++ b/cli/src/commands/file/list.rs
@@ -22,7 +22,7 @@ use crate::ui::Ui;
 
 /// List files in a revision
 #[derive(clap::Args, Clone, Debug)]
-pub(crate) struct FilesArgs {
+pub(crate) struct FileListArgs {
     /// The revision to list files in
     #[arg(long, short, default_value = "@")]
     revision: RevisionArg,
@@ -32,10 +32,27 @@ pub(crate) struct FilesArgs {
 }
 
 #[instrument(skip_all)]
-pub(crate) fn cmd_files(
+pub(crate) fn deprecated_cmd_files(
     ui: &mut Ui,
     command: &CommandHelper,
-    args: &FilesArgs,
+    args: &FileListArgs,
+) -> Result<(), CommandError> {
+    writeln!(
+        ui.warning_default(),
+        "`jj files` is deprecated; use `jj file list` instead, which is equivalent"
+    )?;
+    writeln!(
+        ui.warning_default(),
+        "`jj files` will be removed in a future version, and this will be a hard error"
+    )?;
+    cmd_file_list(ui, command, args)
+}
+
+#[instrument(skip_all)]
+pub(crate) fn cmd_file_list(
+    ui: &mut Ui,
+    command: &CommandHelper,
+    args: &FileListArgs,
 ) -> Result<(), CommandError> {
     let workspace_command = command.workspace_helper(ui)?;
     let commit = workspace_command.resolve_single_rev(&args.revision)?;
diff --git a/cli/src/commands/file/mod.rs b/cli/src/commands/file/mod.rs
new file mode 100644
index 0000000000..b642c31125
--- /dev/null
+++ b/cli/src/commands/file/mod.rs
@@ -0,0 +1,41 @@
+// Copyright 2020-2023 The Jujutsu Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+pub mod chmod;
+pub mod list;
+pub mod show;
+
+use crate::cli_util::CommandHelper;
+use crate::command_error::CommandError;
+use crate::ui::Ui;
+
+/// File operations.
+#[derive(clap::Subcommand, Clone, Debug)]
+pub enum FileCommand {
+    Chmod(chmod::FileChmodArgs),
+    List(list::FileListArgs),
+    Show(show::FileShowArgs),
+}
+
+pub fn cmd_file(
+    ui: &mut Ui,
+    command: &CommandHelper,
+    subcommand: &FileCommand,
+) -> Result<(), CommandError> {
+    match subcommand {
+        FileCommand::Chmod(args) => chmod::cmd_file_chmod(ui, command, args),
+        FileCommand::List(args) => list::cmd_file_list(ui, command, args),
+        FileCommand::Show(args) => show::cmd_file_show(ui, command, args),
+    }
+}
diff --git a/cli/src/commands/cat.rs b/cli/src/commands/file/show.rs
similarity index 89%
rename from cli/src/commands/cat.rs
rename to cli/src/commands/file/show.rs
index 8e5d8a4acd..f99f26bf1e 100644
--- a/cli/src/commands/cat.rs
+++ b/cli/src/commands/file/show.rs
@@ -34,7 +34,7 @@ use crate::ui::Ui;
 /// If the given path is a directory, files in the directory will be visited
 /// recursively.
 #[derive(clap::Args, Clone, Debug)]
-pub(crate) struct CatArgs {
+pub(crate) struct FileShowArgs {
     /// The revision to get the file contents from
     #[arg(long, short, default_value = "@")]
     revision: RevisionArg,
@@ -44,10 +44,27 @@ pub(crate) struct CatArgs {
 }
 
 #[instrument(skip_all)]
-pub(crate) fn cmd_cat(
+pub(crate) fn deprecated_cmd_cat(
     ui: &mut Ui,
     command: &CommandHelper,
-    args: &CatArgs,
+    args: &FileShowArgs,
+) -> Result<(), CommandError> {
+    writeln!(
+        ui.warning_default(),
+        "`jj cat` is deprecated; use `jj file show` instead, which is equivalent"
+    )?;
+    writeln!(
+        ui.warning_default(),
+        "`jj cat` will be removed in a future version, and this will be a hard error"
+    )?;
+    cmd_file_show(ui, command, args)
+}
+
+#[instrument(skip_all)]
+pub(crate) fn cmd_file_show(
+    ui: &mut Ui,
+    command: &CommandHelper,
+    args: &FileShowArgs,
 ) -> Result<(), CommandError> {
     let workspace_command = command.workspace_helper(ui)?;
     let commit = workspace_command.resolve_single_rev(&args.revision)?;
diff --git a/cli/src/commands/git.rs b/cli/src/commands/git.rs
deleted file mode 100644
index 66d288286a..0000000000
--- a/cli/src/commands/git.rs
+++ /dev/null
@@ -1,1350 +0,0 @@
-// Copyright 2020-2023 The Jujutsu Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-use std::collections::{HashMap, HashSet};
-use std::io::Write;
-use std::path::{Path, PathBuf};
-use std::sync::Arc;
-use std::{fmt, fs, io};
-
-use clap::{ArgGroup, Subcommand};
-use itertools::Itertools;
-use jj_lib::backend::TreeValue;
-use jj_lib::file_util;
-use jj_lib::git::{
-    self, parse_gitmodules, GitBranchPushTargets, GitFetchError, GitFetchStats, GitPushError,
-};
-use jj_lib::object_id::ObjectId;
-use jj_lib::op_store::RefTarget;
-use jj_lib::refs::{
-    classify_branch_push_action, BranchPushAction, BranchPushUpdate, LocalAndRemoteRef,
-};
-use jj_lib::repo::{ReadonlyRepo, Repo};
-use jj_lib::repo_path::RepoPath;
-use jj_lib::revset::{self, RevsetExpression, RevsetIteratorExt as _};
-use jj_lib::settings::{ConfigResultExt as _, UserSettings};
-use jj_lib::str_util::StringPattern;
-use jj_lib::view::View;
-use jj_lib::workspace::Workspace;
-
-use crate::cli_util::{
-    print_trackable_remote_branches, short_change_hash, short_commit_hash, start_repo_transaction,
-    CommandHelper, RevisionArg, WorkspaceCommandHelper, WorkspaceCommandTransaction,
-};
-use crate::command_error::{
-    user_error, user_error_with_hint, user_error_with_message, CommandError,
-};
-use crate::git_util::{
-    get_git_repo, is_colocated_git_workspace, print_failed_git_export, print_git_import_stats,
-    with_remote_git_callbacks, GitSidebandProgressMessageWriter,
-};
-use crate::ui::Ui;
-
-/// Commands for working with Git remotes and the underlying Git repo
-///
-/// For a comparison with Git, including a table of commands, see
-/// https://github.com/martinvonz/jj/blob/main/docs/git-comparison.md.
-#[derive(Subcommand, Clone, Debug)]
-pub enum GitCommand {
-    #[command(subcommand)]
-    Remote(GitRemoteCommand),
-    Init(GitInitArgs),
-    Fetch(GitFetchArgs),
-    Clone(GitCloneArgs),
-    Push(GitPushArgs),
-    Import(GitImportArgs),
-    Export(GitExportArgs),
-    #[command(subcommand, hide = true)]
-    Submodule(GitSubmoduleCommand),
-}
-
-/// Manage Git remotes
-///
-/// The Git repo will be a bare git repo stored inside the `.jj/` directory.
-#[derive(Subcommand, Clone, Debug)]
-pub enum GitRemoteCommand {
-    Add(GitRemoteAddArgs),
-    Remove(GitRemoteRemoveArgs),
-    Rename(GitRemoteRenameArgs),
-    List(GitRemoteListArgs),
-}
-
-/// Add a Git remote
-#[derive(clap::Args, Clone, Debug)]
-pub struct GitRemoteAddArgs {
-    /// The remote's name
-    remote: String,
-    /// The remote's URL
-    url: String,
-}
-
-/// Remove a Git remote and forget its branches
-#[derive(clap::Args, Clone, Debug)]
-pub struct GitRemoteRemoveArgs {
-    /// The remote's name
-    remote: String,
-}
-
-/// Rename a Git remote
-#[derive(clap::Args, Clone, Debug)]
-pub struct GitRemoteRenameArgs {
-    /// The name of an existing remote
-    old: String,
-    /// The desired name for `old`
-    new: String,
-}
-
-/// List Git remotes
-#[derive(clap::Args, Clone, Debug)]
-pub struct GitRemoteListArgs {}
-
-/// Create a new Git backed repo.
-#[derive(clap::Args, Clone, Debug)]
-pub struct GitInitArgs {
-    /// The destination directory where the `jj` repo will be created.
-    /// If the directory does not exist, it will be created.
-    /// If no directory is given, the current directory is used.
-    ///
-    /// By default the `git` repo is under `$destination/.jj`
-    #[arg(default_value = ".", value_hint = clap::ValueHint::DirPath)]
-    destination: String,
-
-    /// Specifies that the `jj` repo should also be a valid
-    /// `git` repo, allowing the use of both `jj` and `git` commands
-    /// in the same directory.
-    ///
-    /// This is done by placing the backing git repo into a `.git` directory in
-    /// the root of the `jj` repo along with the `.jj` directory. If the `.git`
-    /// directory already exists, all the existing commits will be imported.
-    ///
-    /// This option is mutually exclusive with `--git-repo`.
-    #[arg(long, conflicts_with = "git_repo")]
-    colocate: bool,
-
-    /// Specifies a path to an **existing** git repository to be
-    /// used as the backing git repo for the newly created `jj` repo.
-    ///
-    /// If the specified `--git-repo` path happens to be the same as
-    /// the `jj` repo path (both .jj and .git directories are in the
-    /// same working directory), then both `jj` and `git` commands
-    /// will work on the same repo. This is called a co-located repo.
-    ///
-    /// This option is mutually exclusive with `--colocate`.
-    #[arg(long, conflicts_with = "colocate", value_hint = clap::ValueHint::DirPath)]
-    git_repo: Option<String>,
-}
-
-/// Fetch from a Git remote
-///
-/// If a working-copy commit gets abandoned, it will be given a new, empty
-/// commit. This is true in general; it is not specific to this command.
-#[derive(clap::Args, Clone, Debug)]
-pub struct GitFetchArgs {
-    /// Fetch only some of the branches
-    ///
-    /// By default, the specified name matches exactly. Use `glob:` prefix to
-    /// expand `*` as a glob. The other wildcard characters aren't supported.
-    #[arg(long, short, default_value = "glob:*", value_parser = StringPattern::parse)]
-    branch: Vec<StringPattern>,
-    /// The remote to fetch from (only named remotes are supported, can be
-    /// repeated)
-    #[arg(long = "remote", value_name = "remote")]
-    remotes: Vec<String>,
-    /// Fetch from all remotes
-    #[arg(long, conflicts_with = "remotes")]
-    all_remotes: bool,
-}
-
-/// Create a new repo backed by a clone of a Git repo
-///
-/// The Git repo will be a bare git repo stored inside the `.jj/` directory.
-#[derive(clap::Args, Clone, Debug)]
-pub struct GitCloneArgs {
-    /// URL or path of the Git repo to clone
-    #[arg(value_hint = clap::ValueHint::DirPath)]
-    source: String,
-    /// The directory to write the Jujutsu repo to
-    #[arg(value_hint = clap::ValueHint::DirPath)]
-    destination: Option<String>,
-    /// Whether or not to colocate the Jujutsu repo with the git repo
-    #[arg(long)]
-    colocate: bool,
-}
-
-/// Push to a Git remote
-///
-/// By default, pushes any branches pointing to
-/// `remote_branches(remote=<remote>)..@`. Use `--branch` to push specific
-/// branches. Use `--all` to push all branches. Use `--change` to generate
-/// branch names based on the change IDs of specific commits.
-///
-/// Before the command actually moves, creates, or deletes a remote branch, it
-/// makes several [safety checks]. If there is a problem, you may need to run
-/// `jj git fetch --remote <remote name>` and/or resolve some [branch
-/// conflicts].
-///
-/// [safety checks]:
-///     https://martinvonz.github.io/jj/latest/branches/#pushing-branches-safety-checks
-///
-/// [branch conflicts]:
-///     https://martinvonz.github.io/jj/latest/branches/#conflicts
-
-#[derive(clap::Args, Clone, Debug)]
-#[command(group(ArgGroup::new("specific").args(&["branch", "change", "revisions"]).multiple(true)))]
-#[command(group(ArgGroup::new("what").args(&["all", "deleted", "tracked"]).conflicts_with("specific")))]
-pub struct GitPushArgs {
-    /// The remote to push to (only named remotes are supported)
-    #[arg(long)]
-    remote: Option<String>,
-    /// Push only this branch, or branches matching a pattern (can be repeated)
-    ///
-    /// By default, the specified name matches exactly. Use `glob:` prefix to
-    /// select branches by wildcard pattern. For details, see
-    /// https://martinvonz.github.io/jj/latest/revsets#string-patterns.
-    #[arg(long, short, value_parser = StringPattern::parse)]
-    branch: Vec<StringPattern>,
-    /// Push all branches (including deleted branches)
-    #[arg(long)]
-    all: bool,
-    /// Push all tracked branches (including deleted branches)
-    ///
-    /// This usually means that the branch was already pushed to or fetched from
-    /// the relevant remote. For details, see
-    /// https://martinvonz.github.io/jj/latest/branches#remotes-and-tracked-branches
-    #[arg(long)]
-    tracked: bool,
-    /// Push all deleted branches
-    ///
-    /// Only tracked branches can be successfully deleted on the remote. A
-    /// warning will be printed if any untracked branches on the remote
-    /// correspond to missing local branches.
-    #[arg(long)]
-    deleted: bool,
-    /// Allow pushing commits with empty descriptions
-    #[arg(long)]
-    allow_empty_description: bool,
-    /// Push branches pointing to these commits (can be repeated)
-    #[arg(long, short)]
-    revisions: Vec<RevisionArg>,
-    /// Push this commit by creating a branch based on its change ID (can be
-    /// repeated)
-    #[arg(long, short)]
-    change: Vec<RevisionArg>,
-    /// Only display what will change on the remote
-    #[arg(long)]
-    dry_run: bool,
-}
-
-/// Update repo with changes made in the underlying Git repo
-///
-/// If a working-copy commit gets abandoned, it will be given a new, empty
-/// commit. This is true in general; it is not specific to this command.
-#[derive(clap::Args, Clone, Debug)]
-pub struct GitImportArgs {}
-
-/// Update the underlying Git repo with changes made in the repo
-#[derive(clap::Args, Clone, Debug)]
-pub struct GitExportArgs {}
-
-/// FOR INTERNAL USE ONLY Interact with git submodules
-#[derive(Subcommand, Clone, Debug)]
-pub enum GitSubmoduleCommand {
-    /// Print the relevant contents from .gitmodules. For debugging purposes
-    /// only.
-    PrintGitmodules(GitSubmodulePrintGitmodulesArgs),
-}
-
-/// Print debugging info about Git submodules
-#[derive(clap::Args, Clone, Debug)]
-#[command(hide = true)]
-pub struct GitSubmodulePrintGitmodulesArgs {
-    /// Read .gitmodules from the given revision.
-    #[arg(long, short = 'r', default_value = "@")]
-    revisions: RevisionArg,
-}
-
-fn make_branch_term(branch_names: &[impl fmt::Display]) -> String {
-    match branch_names {
-        [branch_name] => format!("branch {}", branch_name),
-        branch_names => format!("branches {}", branch_names.iter().join(", ")),
-    }
-}
-
-fn map_git_error(err: git2::Error) -> CommandError {
-    if err.class() == git2::ErrorClass::Ssh {
-        let hint =
-            if err.code() == git2::ErrorCode::Certificate && std::env::var_os("HOME").is_none() {
-                "The HOME environment variable is not set, and might be required for Git to \
-                 successfully load certificates. Try setting it to the path of a directory that \
-                 contains a `.ssh` directory."
-            } else {
-                "Jujutsu uses libssh2, which doesn't respect ~/.ssh/config. Does `ssh -F \
-                 /dev/null` to the host work?"
-            };
-
-        user_error_with_hint(err, hint)
-    } else {
-        user_error(err.to_string())
-    }
-}
-
-pub fn maybe_add_gitignore(workspace_command: &WorkspaceCommandHelper) -> Result<(), CommandError> {
-    if workspace_command.working_copy_shared_with_git() {
-        std::fs::write(
-            workspace_command
-                .workspace_root()
-                .join(".jj")
-                .join(".gitignore"),
-            "/*\n",
-        )
-        .map_err(|e| user_error_with_message("Failed to write .jj/.gitignore file", e))
-    } else {
-        Ok(())
-    }
-}
-
-fn cmd_git_remote_add(
-    ui: &mut Ui,
-    command: &CommandHelper,
-    args: &GitRemoteAddArgs,
-) -> Result<(), CommandError> {
-    let workspace_command = command.workspace_helper(ui)?;
-    let repo = workspace_command.repo();
-    let git_repo = get_git_repo(repo.store())?;
-    git::add_remote(&git_repo, &args.remote, &args.url)?;
-    Ok(())
-}
-
-fn cmd_git_remote_remove(
-    ui: &mut Ui,
-    command: &CommandHelper,
-    args: &GitRemoteRemoveArgs,
-) -> Result<(), CommandError> {
-    let mut workspace_command = command.workspace_helper(ui)?;
-    let repo = workspace_command.repo();
-    let git_repo = get_git_repo(repo.store())?;
-    let mut tx = workspace_command.start_transaction();
-    git::remove_remote(tx.mut_repo(), &git_repo, &args.remote)?;
-    if tx.mut_repo().has_changes() {
-        tx.finish(ui, format!("remove git remote {}", &args.remote))
-    } else {
-        Ok(()) // Do not print "Nothing changed."
-    }
-}
-
-fn cmd_git_remote_rename(
-    ui: &mut Ui,
-    command: &CommandHelper,
-    args: &GitRemoteRenameArgs,
-) -> Result<(), CommandError> {
-    let mut workspace_command = command.workspace_helper(ui)?;
-    let repo = workspace_command.repo();
-    let git_repo = get_git_repo(repo.store())?;
-    let mut tx = workspace_command.start_transaction();
-    git::rename_remote(tx.mut_repo(), &git_repo, &args.old, &args.new)?;
-    if tx.mut_repo().has_changes() {
-        tx.finish(
-            ui,
-            format!("rename git remote {} to {}", &args.old, &args.new),
-        )
-    } else {
-        Ok(()) // Do not print "Nothing changed."
-    }
-}
-
-fn cmd_git_remote_list(
-    ui: &mut Ui,
-    command: &CommandHelper,
-    _args: &GitRemoteListArgs,
-) -> Result<(), CommandError> {
-    let workspace_command = command.workspace_helper(ui)?;
-    let repo = workspace_command.repo();
-    let git_repo = get_git_repo(repo.store())?;
-    for remote_name in git_repo.remotes()?.iter().flatten() {
-        let remote = git_repo.find_remote(remote_name)?;
-        writeln!(
-            ui.stdout(),
-            "{} {}",
-            remote_name,
-            remote.url().unwrap_or("<no URL>")
-        )?;
-    }
-    Ok(())
-}
-
-pub fn git_init(
-    ui: &mut Ui,
-    command: &CommandHelper,
-    workspace_root: &Path,
-    colocate: bool,
-    git_repo: Option<&str>,
-) -> Result<(), CommandError> {
-    #[derive(Clone, Debug)]
-    enum GitInitMode {
-        Colocate,
-        External(PathBuf),
-        Internal,
-    }
-
-    let colocated_git_repo_path = workspace_root.join(".git");
-    let init_mode = if colocate {
-        if colocated_git_repo_path.exists() {
-            GitInitMode::External(colocated_git_repo_path)
-        } else {
-            GitInitMode::Colocate
-        }
-    } else if let Some(path_str) = git_repo {
-        let mut git_repo_path = command.cwd().join(path_str);
-        if !git_repo_path.ends_with(".git") {
-            git_repo_path.push(".git");
-            // Undo if .git doesn't exist - likely a bare repo.
-            if !git_repo_path.exists() {
-                git_repo_path.pop();
-            }
-        }
-        GitInitMode::External(git_repo_path)
-    } else {
-        if colocated_git_repo_path.exists() {
-            return Err(user_error_with_hint(
-                "Did not create a jj repo because there is an existing Git repo in this directory.",
-                "To create a repo backed by the existing Git repo, run `jj git init --colocate` \
-                 instead.",
-            ));
-        }
-        GitInitMode::Internal
-    };
-
-    match &init_mode {
-        GitInitMode::Colocate => {
-            let (workspace, repo) =
-                Workspace::init_colocated_git(command.settings(), workspace_root)?;
-            let workspace_command = command.for_loaded_repo(ui, workspace, repo)?;
-            maybe_add_gitignore(&workspace_command)?;
-        }
-        GitInitMode::External(git_repo_path) => {
-            let (workspace, repo) =
-                Workspace::init_external_git(command.settings(), workspace_root, git_repo_path)?;
-            // Import refs first so all the reachable commits are indexed in
-            // chronological order.
-            let colocated = is_colocated_git_workspace(&workspace, &repo);
-            let repo = init_git_refs(ui, command, repo, colocated)?;
-            let mut workspace_command = command.for_loaded_repo(ui, workspace, repo)?;
-            maybe_add_gitignore(&workspace_command)?;
-            workspace_command.maybe_snapshot(ui)?;
-            if !workspace_command.working_copy_shared_with_git() {
-                let mut tx = workspace_command.start_transaction();
-                jj_lib::git::import_head(tx.mut_repo())?;
-                if let Some(git_head_id) = tx.mut_repo().view().git_head().as_normal().cloned() {
-                    let git_head_commit = tx.mut_repo().store().get_commit(&git_head_id)?;
-                    tx.check_out(&git_head_commit)?;
-                }
-                if tx.mut_repo().has_changes() {
-                    tx.finish(ui, "import git head")?;
-                }
-            }
-            print_trackable_remote_branches(ui, workspace_command.repo().view())?;
-        }
-        GitInitMode::Internal => {
-            Workspace::init_internal_git(command.settings(), workspace_root)?;
-        }
-    }
-    Ok(())
-}
-
-/// Imports branches and tags from the underlying Git repo, exports changes if
-/// the repo is colocated.
-///
-/// This is similar to `WorkspaceCommandHelper::import_git_refs()`, but never
-/// moves the Git HEAD to the working copy parent.
-fn init_git_refs(
-    ui: &mut Ui,
-    command: &CommandHelper,
-    repo: Arc<ReadonlyRepo>,
-    colocated: bool,
-) -> Result<Arc<ReadonlyRepo>, CommandError> {
-    let mut tx = start_repo_transaction(&repo, command.settings(), command.string_args());
-    // There should be no old refs to abandon, but enforce it.
-    let mut git_settings = command.settings().git_settings();
-    git_settings.abandon_unreachable_commits = false;
-    let stats = git::import_some_refs(
-        tx.mut_repo(),
-        &git_settings,
-        // Initial import shouldn't fail because of reserved remote name.
-        |ref_name| !git::is_reserved_git_remote_ref(ref_name),
-    )?;
-    if !tx.mut_repo().has_changes() {
-        return Ok(repo);
-    }
-    print_git_import_stats(ui, tx.repo(), &stats, false)?;
-    if colocated {
-        // If git.auto-local-branch = true, local branches could be created for
-        // the imported remote branches.
-        let failed_branches = git::export_refs(tx.mut_repo())?;
-        print_failed_git_export(ui, &failed_branches)?;
-    }
-    let repo = tx.commit("import git refs");
-    writeln!(
-        ui.status(),
-        "Done importing changes from the underlying Git repo."
-    )?;
-    Ok(repo)
-}
-
-fn cmd_git_init(
-    ui: &mut Ui,
-    command: &CommandHelper,
-    args: &GitInitArgs,
-) -> Result<(), CommandError> {
-    let cwd = command.cwd();
-    let wc_path = cwd.join(&args.destination);
-    let wc_path = file_util::create_or_reuse_dir(&wc_path)
-        .and_then(|_| wc_path.canonicalize())
-        .map_err(|e| user_error_with_message("Failed to create workspace", e))?;
-
-    git_init(
-        ui,
-        command,
-        &wc_path,
-        args.colocate,
-        args.git_repo.as_deref(),
-    )?;
-
-    let relative_wc_path = file_util::relative_path(cwd, &wc_path);
-    writeln!(
-        ui.status(),
-        r#"Initialized repo in "{}""#,
-        relative_wc_path.display()
-    )?;
-
-    Ok(())
-}
-
-#[tracing::instrument(skip(ui, command))]
-fn cmd_git_fetch(
-    ui: &mut Ui,
-    command: &CommandHelper,
-    args: &GitFetchArgs,
-) -> Result<(), CommandError> {
-    let mut workspace_command = command.workspace_helper(ui)?;
-    let git_repo = get_git_repo(workspace_command.repo().store())?;
-    let remotes = if args.all_remotes {
-        get_all_remotes(&git_repo)?
-    } else if args.remotes.is_empty() {
-        get_default_fetch_remotes(ui, command.settings(), &git_repo)?
-    } else {
-        args.remotes.clone()
-    };
-    let mut tx = workspace_command.start_transaction();
-    for remote in &remotes {
-        let stats = with_remote_git_callbacks(ui, None, |cb| {
-            git::fetch(
-                tx.mut_repo(),
-                &git_repo,
-                remote,
-                &args.branch,
-                cb,
-                &command.settings().git_settings(),
-            )
-        })
-        .map_err(|err| match err {
-            GitFetchError::InvalidBranchPattern => {
-                if args
-                    .branch
-                    .iter()
-                    .any(|pattern| pattern.as_exact().map_or(false, |s| s.contains('*')))
-                {
-                    user_error_with_hint(
-                        err,
-                        "Prefix the pattern with `glob:` to expand `*` as a glob",
-                    )
-                } else {
-                    user_error(err)
-                }
-            }
-            GitFetchError::GitImportError(err) => err.into(),
-            GitFetchError::InternalGitError(err) => map_git_error(err),
-            _ => user_error(err),
-        })?;
-        print_git_import_stats(ui, tx.repo(), &stats.import_stats, true)?;
-    }
-    tx.finish(
-        ui,
-        format!("fetch from git remote(s) {}", remotes.iter().join(",")),
-    )?;
-    Ok(())
-}
-
-fn get_single_remote(git_repo: &git2::Repository) -> Result<Option<String>, CommandError> {
-    let git_remotes = git_repo.remotes()?;
-    Ok(match git_remotes.len() {
-        1 => git_remotes.get(0).map(ToOwned::to_owned),
-        _ => None,
-    })
-}
-
-const DEFAULT_REMOTE: &str = "origin";
-
-fn get_default_fetch_remotes(
-    ui: &Ui,
-    settings: &UserSettings,
-    git_repo: &git2::Repository,
-) -> Result<Vec<String>, CommandError> {
-    const KEY: &str = "git.fetch";
-    if let Ok(remotes) = settings.config().get(KEY) {
-        Ok(remotes)
-    } else if let Some(remote) = settings.config().get_string(KEY).optional()? {
-        Ok(vec![remote])
-    } else if let Some(remote) = get_single_remote(git_repo)? {
-        // if nothing was explicitly configured, try to guess
-        if remote != DEFAULT_REMOTE {
-            if let Some(mut writer) = ui.hint_default() {
-                writeln!(writer, "Fetching from the only existing remote: {remote}")?;
-            }
-        }
-        Ok(vec![remote])
-    } else {
-        Ok(vec![DEFAULT_REMOTE.to_owned()])
-    }
-}
-
-fn get_all_remotes(git_repo: &git2::Repository) -> Result<Vec<String>, CommandError> {
-    let git_remotes = git_repo.remotes()?;
-    Ok(git_remotes
-        .iter()
-        .filter_map(|x| x.map(ToOwned::to_owned))
-        .collect())
-}
-
-fn absolute_git_source(cwd: &Path, source: &str) -> String {
-    // Git appears to turn URL-like source to absolute path if local git directory
-    // exits, and fails because '$PWD/https' is unsupported protocol. Since it would
-    // be tedious to copy the exact git (or libgit2) behavior, we simply assume a
-    // source containing ':' is a URL, SSH remote, or absolute path with Windows
-    // drive letter.
-    if !source.contains(':') && Path::new(source).exists() {
-        // It's less likely that cwd isn't utf-8, so just fall back to original source.
-        cwd.join(source)
-            .into_os_string()
-            .into_string()
-            .unwrap_or_else(|_| source.to_owned())
-    } else {
-        source.to_owned()
-    }
-}
-
-fn clone_destination_for_source(source: &str) -> Option<&str> {
-    let destination = source.strip_suffix(".git").unwrap_or(source);
-    let destination = destination.strip_suffix('/').unwrap_or(destination);
-    destination
-        .rsplit_once(&['/', '\\', ':'][..])
-        .map(|(_, name)| name)
-}
-
-fn is_empty_dir(path: &Path) -> bool {
-    if let Ok(mut entries) = path.read_dir() {
-        entries.next().is_none()
-    } else {
-        false
-    }
-}
-
-fn cmd_git_clone(
-    ui: &mut Ui,
-    command: &CommandHelper,
-    args: &GitCloneArgs,
-) -> Result<(), CommandError> {
-    let remote_name = "origin";
-    let source = absolute_git_source(command.cwd(), &args.source);
-    let wc_path_str = args
-        .destination
-        .as_deref()
-        .or_else(|| clone_destination_for_source(&source))
-        .ok_or_else(|| user_error("No destination specified and wasn't able to guess it"))?;
-    let wc_path = command.cwd().join(wc_path_str);
-    let wc_path_existed = match fs::create_dir(&wc_path) {
-        Ok(()) => false,
-        Err(err) if err.kind() == io::ErrorKind::AlreadyExists => true,
-        Err(err) => {
-            return Err(user_error_with_message(
-                format!("Failed to create {wc_path_str}"),
-                err,
-            ));
-        }
-    };
-    if wc_path_existed && !is_empty_dir(&wc_path) {
-        return Err(user_error(
-            "Destination path exists and is not an empty directory",
-        ));
-    }
-
-    // Canonicalize because fs::remove_dir_all() doesn't seem to like e.g.
-    // `/some/path/.`
-    let canonical_wc_path: PathBuf = wc_path
-        .canonicalize()
-        .map_err(|err| user_error_with_message(format!("Failed to create {wc_path_str}"), err))?;
-    let clone_result = do_git_clone(
-        ui,
-        command,
-        args.colocate,
-        remote_name,
-        &source,
-        &canonical_wc_path,
-    );
-    if clone_result.is_err() {
-        let clean_up_dirs = || -> io::Result<()> {
-            fs::remove_dir_all(canonical_wc_path.join(".jj"))?;
-            if args.colocate {
-                fs::remove_dir_all(canonical_wc_path.join(".git"))?;
-            }
-            if !wc_path_existed {
-                fs::remove_dir(&canonical_wc_path)?;
-            }
-            Ok(())
-        };
-        if let Err(err) = clean_up_dirs() {
-            writeln!(
-                ui.warning_default(),
-                "Failed to clean up {}: {}",
-                canonical_wc_path.display(),
-                err
-            )
-            .ok();
-        }
-    }
-
-    let (mut workspace_command, stats) = clone_result?;
-    if let Some(default_branch) = &stats.default_branch {
-        let default_branch_remote_ref = workspace_command
-            .repo()
-            .view()
-            .get_remote_branch(default_branch, remote_name);
-        if let Some(commit_id) = default_branch_remote_ref.target.as_normal().cloned() {
-            let mut checkout_tx = workspace_command.start_transaction();
-            // For convenience, create local branch as Git would do.
-            checkout_tx
-                .mut_repo()
-                .track_remote_branch(default_branch, remote_name);
-            if let Ok(commit) = checkout_tx.repo().store().get_commit(&commit_id) {
-                checkout_tx.check_out(&commit)?;
-            }
-            checkout_tx.finish(ui, "check out git remote's default branch")?;
-        }
-    }
-    Ok(())
-}
-
-fn do_git_clone(
-    ui: &mut Ui,
-    command: &CommandHelper,
-    colocate: bool,
-    remote_name: &str,
-    source: &str,
-    wc_path: &Path,
-) -> Result<(WorkspaceCommandHelper, GitFetchStats), CommandError> {
-    let (workspace, repo) = if colocate {
-        Workspace::init_colocated_git(command.settings(), wc_path)?
-    } else {
-        Workspace::init_internal_git(command.settings(), wc_path)?
-    };
-    let git_repo = get_git_repo(repo.store())?;
-    writeln!(
-        ui.status(),
-        r#"Fetching into new repo in "{}""#,
-        wc_path.display()
-    )?;
-    let mut workspace_command = command.for_loaded_repo(ui, workspace, repo)?;
-    maybe_add_gitignore(&workspace_command)?;
-    git_repo.remote(remote_name, source).unwrap();
-    let mut fetch_tx = workspace_command.start_transaction();
-
-    let stats = with_remote_git_callbacks(ui, None, |cb| {
-        git::fetch(
-            fetch_tx.mut_repo(),
-            &git_repo,
-            remote_name,
-            &[StringPattern::everything()],
-            cb,
-            &command.settings().git_settings(),
-        )
-    })
-    .map_err(|err| match err {
-        GitFetchError::NoSuchRemote(_) => {
-            panic!("shouldn't happen as we just created the git remote")
-        }
-        GitFetchError::GitImportError(err) => CommandError::from(err),
-        GitFetchError::InternalGitError(err) => map_git_error(err),
-        GitFetchError::InvalidBranchPattern => {
-            unreachable!("we didn't provide any globs")
-        }
-    })?;
-    print_git_import_stats(ui, fetch_tx.repo(), &stats.import_stats, true)?;
-    fetch_tx.finish(ui, "fetch from git remote into empty repo")?;
-    Ok((workspace_command, stats))
-}
-
-#[derive(Clone, Copy, Debug, Eq, PartialEq)]
-enum BranchMoveDirection {
-    Forward,
-    Backward,
-    Sideways,
-}
-
-fn cmd_git_push(
-    ui: &mut Ui,
-    command: &CommandHelper,
-    args: &GitPushArgs,
-) -> Result<(), CommandError> {
-    let mut workspace_command = command.workspace_helper(ui)?;
-    let git_repo = get_git_repo(workspace_command.repo().store())?;
-
-    let remote = if let Some(name) = &args.remote {
-        name.clone()
-    } else {
-        get_default_push_remote(ui, command.settings(), &git_repo)?
-    };
-
-    let repo = workspace_command.repo().clone();
-    let mut tx = workspace_command.start_transaction();
-    let tx_description;
-    let mut branch_updates = vec![];
-    if args.all {
-        for (branch_name, targets) in repo.view().local_remote_branches(&remote) {
-            match classify_branch_update(branch_name, &remote, targets) {
-                Ok(Some(update)) => branch_updates.push((branch_name.to_owned(), update)),
-                Ok(None) => {}
-                Err(reason) => reason.print(ui)?,
-            }
-        }
-        tx_description = format!("push all branches to git remote {remote}");
-    } else if args.tracked {
-        for (branch_name, targets) in repo.view().local_remote_branches(&remote) {
-            if !targets.remote_ref.is_tracking() {
-                continue;
-            }
-            match classify_branch_update(branch_name, &remote, targets) {
-                Ok(Some(update)) => branch_updates.push((branch_name.to_owned(), update)),
-                Ok(None) => {}
-                Err(reason) => reason.print(ui)?,
-            }
-        }
-        tx_description = format!("push all tracked branches to git remote {remote}");
-    } else if args.deleted {
-        for (branch_name, targets) in repo.view().local_remote_branches(&remote) {
-            if targets.local_target.is_present() {
-                continue;
-            }
-            match classify_branch_update(branch_name, &remote, targets) {
-                Ok(Some(update)) => branch_updates.push((branch_name.to_owned(), update)),
-                Ok(None) => {}
-                Err(reason) => reason.print(ui)?,
-            }
-        }
-        tx_description = format!("push all deleted branches to git remote {remote}");
-    } else {
-        let mut seen_branches: HashSet<&str> = HashSet::new();
-
-        // Process --change branches first because matching branches can be moved.
-        let change_branch_names = update_change_branches(
-            ui,
-            &mut tx,
-            &args.change,
-            &command.settings().push_branch_prefix(),
-        )?;
-        let change_branches = change_branch_names.iter().map(|branch_name| {
-            let targets = LocalAndRemoteRef {
-                local_target: tx.repo().view().get_local_branch(branch_name),
-                remote_ref: tx.repo().view().get_remote_branch(branch_name, &remote),
-            };
-            (branch_name.as_ref(), targets)
-        });
-        let branches_by_name = find_branches_to_push(repo.view(), &args.branch, &remote)?;
-        for (branch_name, targets) in change_branches.chain(branches_by_name.iter().copied()) {
-            if !seen_branches.insert(branch_name) {
-                continue;
-            }
-            match classify_branch_update(branch_name, &remote, targets) {
-                Ok(Some(update)) => branch_updates.push((branch_name.to_owned(), update)),
-                Ok(None) => writeln!(
-                    ui.status(),
-                    "Branch {branch_name}@{remote} already matches {branch_name}",
-                )?,
-                Err(reason) => return Err(reason.into()),
-            }
-        }
-
-        let use_default_revset =
-            args.branch.is_empty() && args.change.is_empty() && args.revisions.is_empty();
-        let branches_targeted = find_branches_targeted_by_revisions(
-            ui,
-            tx.base_workspace_helper(),
-            &remote,
-            &args.revisions,
-            use_default_revset,
-        )?;
-        for &(branch_name, targets) in &branches_targeted {
-            if !seen_branches.insert(branch_name) {
-                continue;
-            }
-            match classify_branch_update(branch_name, &remote, targets) {
-                Ok(Some(update)) => branch_updates.push((branch_name.to_owned(), update)),
-                Ok(None) => {}
-                Err(reason) => reason.print(ui)?,
-            }
-        }
-
-        tx_description = format!(
-            "push {} to git remote {}",
-            make_branch_term(
-                &branch_updates
-                    .iter()
-                    .map(|(branch, _)| branch.as_str())
-                    .collect_vec()
-            ),
-            &remote
-        );
-    }
-    if branch_updates.is_empty() {
-        writeln!(ui.status(), "Nothing changed.")?;
-        return Ok(());
-    }
-
-    let mut branch_push_direction = HashMap::new();
-    for (branch_name, update) in &branch_updates {
-        let BranchPushUpdate {
-            old_target: Some(old_target),
-            new_target: Some(new_target),
-        } = update
-        else {
-            continue;
-        };
-        assert_ne!(old_target, new_target);
-        branch_push_direction.insert(
-            branch_name.to_string(),
-            if repo.index().is_ancestor(old_target, new_target) {
-                BranchMoveDirection::Forward
-            } else if repo.index().is_ancestor(new_target, old_target) {
-                BranchMoveDirection::Backward
-            } else {
-                BranchMoveDirection::Sideways
-            },
-        );
-    }
-
-    // Check if there are conflicts in any commits we're about to push that haven't
-    // already been pushed.
-    let new_heads = branch_updates
-        .iter()
-        .filter_map(|(_, update)| update.new_target.clone())
-        .collect_vec();
-    let mut old_heads = repo
-        .view()
-        .remote_branches(&remote)
-        .flat_map(|(_, old_head)| old_head.target.added_ids())
-        .cloned()
-        .collect_vec();
-    if old_heads.is_empty() {
-        old_heads.push(repo.store().root_commit_id().clone());
-    }
-    for commit in revset::walk_revs(repo.as_ref(), &new_heads, &old_heads)?
-        .iter()
-        .commits(repo.store())
-    {
-        let commit = commit?;
-        let mut reasons = vec![];
-        if commit.description().is_empty() && !args.allow_empty_description {
-            reasons.push("it has no description");
-        }
-        if commit.author().name.is_empty()
-            || commit.author().name == UserSettings::USER_NAME_PLACEHOLDER
-            || commit.author().email.is_empty()
-            || commit.author().email == UserSettings::USER_EMAIL_PLACEHOLDER
-            || commit.committer().name.is_empty()
-            || commit.committer().name == UserSettings::USER_NAME_PLACEHOLDER
-            || commit.committer().email.is_empty()
-            || commit.committer().email == UserSettings::USER_EMAIL_PLACEHOLDER
-        {
-            reasons.push("it has no author and/or committer set");
-        }
-        if commit.has_conflict()? {
-            reasons.push("it has conflicts");
-        }
-        if !reasons.is_empty() {
-            return Err(user_error(format!(
-                "Won't push commit {} since {}",
-                short_commit_hash(commit.id()),
-                reasons.join(" and ")
-            )));
-        }
-    }
-
-    writeln!(ui.status(), "Branch changes to push to {}:", &remote)?;
-    for (branch_name, update) in &branch_updates {
-        match (&update.old_target, &update.new_target) {
-            (Some(old_target), Some(new_target)) => {
-                let old = short_commit_hash(old_target);
-                let new = short_commit_hash(new_target);
-                // TODO(ilyagr): Add color. Once there is color, "Move branch ... sideways" may
-                // read more naturally than "Move sideways branch ...". Without color, it's hard
-                // to see at a glance if one branch among many was moved sideways (say).
-                // TODO: People on Discord suggest "Move branch ... forward by n commits",
-                // possibly "Move branch ... sideways (X forward, Y back)".
-                let msg = match branch_push_direction.get(branch_name).unwrap() {
-                    BranchMoveDirection::Forward => {
-                        format!("Move forward branch {branch_name} from {old} to {new}")
-                    }
-                    BranchMoveDirection::Backward => {
-                        format!("Move backward branch {branch_name} from {old} to {new}")
-                    }
-                    BranchMoveDirection::Sideways => {
-                        format!("Move sideways branch {branch_name} from {old} to {new}")
-                    }
-                };
-                writeln!(ui.status(), "  {msg}")?;
-            }
-            (Some(old_target), None) => {
-                writeln!(
-                    ui.status(),
-                    "  Delete branch {branch_name} from {}",
-                    short_commit_hash(old_target)
-                )?;
-            }
-            (None, Some(new_target)) => {
-                writeln!(
-                    ui.status(),
-                    "  Add branch {branch_name} to {}",
-                    short_commit_hash(new_target)
-                )?;
-            }
-            (None, None) => {
-                panic!("Not pushing any change to branch {branch_name}");
-            }
-        }
-    }
-
-    if args.dry_run {
-        writeln!(ui.status(), "Dry-run requested, not pushing.")?;
-        return Ok(());
-    }
-
-    let targets = GitBranchPushTargets { branch_updates };
-    let mut writer = GitSidebandProgressMessageWriter::new(ui);
-    let mut sideband_progress_callback = |progress_message: &[u8]| {
-        _ = writer.write(ui, progress_message);
-    };
-    with_remote_git_callbacks(ui, Some(&mut sideband_progress_callback), |cb| {
-        git::push_branches(tx.mut_repo(), &git_repo, &remote, &targets, cb)
-    })
-    .map_err(|err| match err {
-        GitPushError::InternalGitError(err) => map_git_error(err),
-        GitPushError::RefInUnexpectedLocation(refs) => user_error_with_hint(
-            format!(
-                "Refusing to push a branch that unexpectedly moved on the remote. Affected refs: \
-                 {}",
-                refs.join(", ")
-            ),
-            "Try fetching from the remote, then make the branch point to where you want it to be, \
-             and push again.",
-        ),
-        _ => user_error(err),
-    })?;
-    writer.flush(ui)?;
-    tx.finish(ui, tx_description)?;
-    Ok(())
-}
-
-fn get_default_push_remote(
-    ui: &Ui,
-    settings: &UserSettings,
-    git_repo: &git2::Repository,
-) -> Result<String, CommandError> {
-    if let Some(remote) = settings.config().get_string("git.push").optional()? {
-        Ok(remote)
-    } else if let Some(remote) = get_single_remote(git_repo)? {
-        // similar to get_default_fetch_remotes
-        if remote != DEFAULT_REMOTE {
-            if let Some(mut writer) = ui.hint_default() {
-                writeln!(writer, "Pushing to the only existing remote: {remote}")?;
-            }
-        }
-        Ok(remote)
-    } else {
-        Ok(DEFAULT_REMOTE.to_owned())
-    }
-}
-
-#[derive(Clone, Debug)]
-struct RejectedBranchUpdateReason {
-    message: String,
-    hint: Option<String>,
-}
-
-impl RejectedBranchUpdateReason {
-    fn print(&self, ui: &Ui) -> io::Result<()> {
-        writeln!(ui.warning_default(), "{}", self.message)?;
-        if let Some(hint) = &self.hint {
-            if let Some(mut writer) = ui.hint_default() {
-                writeln!(writer, "{hint}")?;
-            }
-        }
-        Ok(())
-    }
-}
-
-impl From<RejectedBranchUpdateReason> for CommandError {
-    fn from(reason: RejectedBranchUpdateReason) -> Self {
-        let RejectedBranchUpdateReason { message, hint } = reason;
-        let mut cmd_err = user_error(message);
-        cmd_err.extend_hints(hint);
-        cmd_err
-    }
-}
-
-fn classify_branch_update(
-    branch_name: &str,
-    remote_name: &str,
-    targets: LocalAndRemoteRef,
-) -> Result<Option<BranchPushUpdate>, RejectedBranchUpdateReason> {
-    let push_action = classify_branch_push_action(targets);
-    match push_action {
-        BranchPushAction::AlreadyMatches => Ok(None),
-        BranchPushAction::LocalConflicted => Err(RejectedBranchUpdateReason {
-            message: format!("Branch {branch_name} is conflicted"),
-            hint: Some(
-                "Run `jj branch list` to inspect, and use `jj branch set` to fix it up.".to_owned(),
-            ),
-        }),
-        BranchPushAction::RemoteConflicted => Err(RejectedBranchUpdateReason {
-            message: format!("Branch {branch_name}@{remote_name} is conflicted"),
-            hint: Some("Run `jj git fetch` to update the conflicted remote branch.".to_owned()),
-        }),
-        BranchPushAction::RemoteUntracked => Err(RejectedBranchUpdateReason {
-            message: format!("Non-tracking remote branch {branch_name}@{remote_name} exists"),
-            hint: Some(format!(
-                "Run `jj branch track {branch_name}@{remote_name}` to import the remote branch."
-            )),
-        }),
-        BranchPushAction::Update(update) => Ok(Some(update)),
-    }
-}
-
-/// Creates or moves branches based on the change IDs.
-fn update_change_branches(
-    ui: &Ui,
-    tx: &mut WorkspaceCommandTransaction,
-    changes: &[RevisionArg],
-    branch_prefix: &str,
-) -> Result<Vec<String>, CommandError> {
-    let mut branch_names = Vec::new();
-    for change_arg in changes {
-        let workspace_command = tx.base_workspace_helper();
-        let commit = workspace_command.resolve_single_rev(change_arg)?;
-        let mut branch_name = format!("{branch_prefix}{}", commit.change_id().hex());
-        let view = tx.base_repo().view();
-        if view.get_local_branch(&branch_name).is_absent() {
-            // A local branch with the full change ID doesn't exist already, so use the
-            // short ID if it's not ambiguous (which it shouldn't be most of the time).
-            let short_change_id = short_change_hash(commit.change_id());
-            if workspace_command
-                .resolve_single_rev(&RevisionArg::from(short_change_id.clone()))
-                .is_ok()
-            {
-                // Short change ID is not ambiguous, so update the branch name to use it.
-                branch_name = format!("{branch_prefix}{short_change_id}");
-            };
-        }
-        if view.get_local_branch(&branch_name).is_absent() {
-            writeln!(
-                ui.status(),
-                "Creating branch {branch_name} for revision {change_arg}",
-            )?;
-        }
-        tx.mut_repo()
-            .set_local_branch_target(&branch_name, RefTarget::normal(commit.id().clone()));
-        branch_names.push(branch_name);
-    }
-    Ok(branch_names)
-}
-
-fn find_branches_to_push<'a>(
-    view: &'a View,
-    branch_patterns: &[StringPattern],
-    remote_name: &str,
-) -> Result<Vec<(&'a str, LocalAndRemoteRef<'a>)>, CommandError> {
-    let mut matching_branches = vec![];
-    let mut unmatched_patterns = vec![];
-    for pattern in branch_patterns {
-        let mut matches = view
-            .local_remote_branches_matching(pattern, remote_name)
-            .filter(|(_, targets)| {
-                // If the remote exists but is not tracking, the absent local shouldn't
-                // be considered a deleted branch.
-                targets.local_target.is_present() || targets.remote_ref.is_tracking()
-            })
-            .peekable();
-        if matches.peek().is_none() {
-            unmatched_patterns.push(pattern);
-        }
-        matching_branches.extend(matches);
-    }
-    match &unmatched_patterns[..] {
-        [] => Ok(matching_branches),
-        [pattern] if pattern.is_exact() => Err(user_error(format!("No such branch: {pattern}"))),
-        patterns => Err(user_error(format!(
-            "No matching branches for patterns: {}",
-            patterns.iter().join(", ")
-        ))),
-    }
-}
-
-fn find_branches_targeted_by_revisions<'a>(
-    ui: &Ui,
-    workspace_command: &'a WorkspaceCommandHelper,
-    remote_name: &str,
-    revisions: &[RevisionArg],
-    use_default_revset: bool,
-) -> Result<Vec<(&'a str, LocalAndRemoteRef<'a>)>, CommandError> {
-    let mut revision_commit_ids = HashSet::new();
-    if use_default_revset {
-        let Some(wc_commit_id) = workspace_command.get_wc_commit_id().cloned() else {
-            return Err(user_error("Nothing checked out in this workspace"));
-        };
-        let current_branches_expression = RevsetExpression::remote_branches(
-            StringPattern::everything(),
-            StringPattern::Exact(remote_name.to_owned()),
-        )
-        .range(&RevsetExpression::commit(wc_commit_id))
-        .intersection(&RevsetExpression::branches(StringPattern::everything()));
-        let current_branches_revset =
-            current_branches_expression.evaluate_programmatic(workspace_command.repo().as_ref())?;
-        revision_commit_ids.extend(current_branches_revset.iter());
-        if revision_commit_ids.is_empty() {
-            writeln!(
-                ui.warning_default(),
-                "No branches found in the default push revset: \
-                 remote_branches(remote={remote_name})..@"
-            )?;
-        }
-    }
-    for rev_arg in revisions {
-        let mut expression = workspace_command.parse_revset(rev_arg)?;
-        expression.intersect_with(&RevsetExpression::branches(StringPattern::everything()));
-        let mut commit_ids = expression.evaluate_to_commit_ids()?.peekable();
-        if commit_ids.peek().is_none() {
-            writeln!(
-                ui.warning_default(),
-                "No branches point to the specified revisions: {rev_arg}"
-            )?;
-        }
-        revision_commit_ids.extend(commit_ids);
-    }
-    let branches_targeted = workspace_command
-        .repo()
-        .view()
-        .local_remote_branches(remote_name)
-        .filter(|(_, targets)| {
-            let mut local_ids = targets.local_target.added_ids();
-            local_ids.any(|id| revision_commit_ids.contains(id))
-        })
-        .collect_vec();
-    Ok(branches_targeted)
-}
-
-fn cmd_git_import(
-    ui: &mut Ui,
-    command: &CommandHelper,
-    _args: &GitImportArgs,
-) -> Result<(), CommandError> {
-    let mut workspace_command = command.workspace_helper(ui)?;
-    let mut tx = workspace_command.start_transaction();
-    // In non-colocated repo, HEAD@git will never be moved internally by jj.
-    // That's why cmd_git_export() doesn't export the HEAD ref.
-    git::import_head(tx.mut_repo())?;
-    let stats = git::import_refs(tx.mut_repo(), &command.settings().git_settings())?;
-    print_git_import_stats(ui, tx.repo(), &stats, true)?;
-    tx.finish(ui, "import git refs")?;
-    Ok(())
-}
-
-fn cmd_git_export(
-    ui: &mut Ui,
-    command: &CommandHelper,
-    _args: &GitExportArgs,
-) -> Result<(), CommandError> {
-    let mut workspace_command = command.workspace_helper(ui)?;
-    let mut tx = workspace_command.start_transaction();
-    let failed_branches = git::export_refs(tx.mut_repo())?;
-    tx.finish(ui, "export git refs")?;
-    print_failed_git_export(ui, &failed_branches)?;
-    Ok(())
-}
-
-fn cmd_git_submodule_print_gitmodules(
-    ui: &mut Ui,
-    command: &CommandHelper,
-    args: &GitSubmodulePrintGitmodulesArgs,
-) -> Result<(), CommandError> {
-    let workspace_command = command.workspace_helper(ui)?;
-    let repo = workspace_command.repo();
-    let commit = workspace_command.resolve_single_rev(&args.revisions)?;
-    let tree = commit.tree()?;
-    let gitmodules_path = RepoPath::from_internal_string(".gitmodules");
-    let mut gitmodules_file = match tree.path_value(gitmodules_path)?.into_resolved() {
-        Ok(None) => {
-            writeln!(ui.status(), "No submodules!")?;
-            return Ok(());
-        }
-        Ok(Some(TreeValue::File { id, .. })) => repo.store().read_file(gitmodules_path, &id)?,
-        _ => {
-            return Err(user_error(".gitmodules is not a file."));
-        }
-    };
-
-    let submodules = parse_gitmodules(&mut gitmodules_file)?;
-    for (name, submodule) in submodules {
-        writeln!(
-            ui.stdout(),
-            "name:{}\nurl:{}\npath:{}\n\n",
-            name,
-            submodule.url,
-            submodule.path
-        )?;
-    }
-    Ok(())
-}
-
-pub fn cmd_git(
-    ui: &mut Ui,
-    command: &CommandHelper,
-    subcommand: &GitCommand,
-) -> Result<(), CommandError> {
-    match subcommand {
-        GitCommand::Init(args) => cmd_git_init(ui, command, args),
-        GitCommand::Fetch(args) => cmd_git_fetch(ui, command, args),
-        GitCommand::Clone(args) => cmd_git_clone(ui, command, args),
-        GitCommand::Remote(GitRemoteCommand::Add(args)) => cmd_git_remote_add(ui, command, args),
-        GitCommand::Remote(GitRemoteCommand::Remove(args)) => {
-            cmd_git_remote_remove(ui, command, args)
-        }
-        GitCommand::Remote(GitRemoteCommand::Rename(args)) => {
-            cmd_git_remote_rename(ui, command, args)
-        }
-        GitCommand::Remote(GitRemoteCommand::List(args)) => cmd_git_remote_list(ui, command, args),
-        GitCommand::Push(args) => cmd_git_push(ui, command, args),
-        GitCommand::Import(args) => cmd_git_import(ui, command, args),
-        GitCommand::Export(args) => cmd_git_export(ui, command, args),
-        GitCommand::Submodule(GitSubmoduleCommand::PrintGitmodules(args)) => {
-            cmd_git_submodule_print_gitmodules(ui, command, args)
-        }
-    }
-}
diff --git a/cli/src/commands/git/clone.rs b/cli/src/commands/git/clone.rs
new file mode 100644
index 0000000000..edef604b5c
--- /dev/null
+++ b/cli/src/commands/git/clone.rs
@@ -0,0 +1,211 @@
+// Copyright 2020-2023 The Jujutsu Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use std::io::Write;
+use std::path::{Path, PathBuf};
+use std::{fs, io};
+
+use jj_lib::git::{self, GitFetchError, GitFetchStats};
+use jj_lib::repo::Repo;
+use jj_lib::str_util::StringPattern;
+use jj_lib::workspace::Workspace;
+
+use crate::cli_util::{CommandHelper, WorkspaceCommandHelper};
+use crate::command_error::{user_error, user_error_with_message, CommandError};
+use crate::commands::git::{map_git_error, maybe_add_gitignore};
+use crate::git_util::{get_git_repo, print_git_import_stats, with_remote_git_callbacks};
+use crate::ui::Ui;
+
+/// Create a new repo backed by a clone of a Git repo
+///
+/// The Git repo will be a bare git repo stored inside the `.jj/` directory.
+#[derive(clap::Args, Clone, Debug)]
+pub struct GitCloneArgs {
+    /// URL or path of the Git repo to clone
+    #[arg(value_hint = clap::ValueHint::DirPath)]
+    source: String,
+    /// The directory to write the Jujutsu repo to
+    #[arg(value_hint = clap::ValueHint::DirPath)]
+    destination: Option<String>,
+    /// Whether or not to colocate the Jujutsu repo with the git repo
+    #[arg(long)]
+    colocate: bool,
+}
+
+fn absolute_git_source(cwd: &Path, source: &str) -> String {
+    // Git appears to turn URL-like source to absolute path if local git directory
+    // exits, and fails because '$PWD/https' is unsupported protocol. Since it would
+    // be tedious to copy the exact git (or libgit2) behavior, we simply assume a
+    // source containing ':' is a URL, SSH remote, or absolute path with Windows
+    // drive letter.
+    if !source.contains(':') && Path::new(source).exists() {
+        // It's less likely that cwd isn't utf-8, so just fall back to original source.
+        cwd.join(source)
+            .into_os_string()
+            .into_string()
+            .unwrap_or_else(|_| source.to_owned())
+    } else {
+        source.to_owned()
+    }
+}
+
+fn clone_destination_for_source(source: &str) -> Option<&str> {
+    let destination = source.strip_suffix(".git").unwrap_or(source);
+    let destination = destination.strip_suffix('/').unwrap_or(destination);
+    destination
+        .rsplit_once(&['/', '\\', ':'][..])
+        .map(|(_, name)| name)
+}
+
+fn is_empty_dir(path: &Path) -> bool {
+    if let Ok(mut entries) = path.read_dir() {
+        entries.next().is_none()
+    } else {
+        false
+    }
+}
+
+pub fn cmd_git_clone(
+    ui: &mut Ui,
+    command: &CommandHelper,
+    args: &GitCloneArgs,
+) -> Result<(), CommandError> {
+    let remote_name = "origin";
+    let source = absolute_git_source(command.cwd(), &args.source);
+    let wc_path_str = args
+        .destination
+        .as_deref()
+        .or_else(|| clone_destination_for_source(&source))
+        .ok_or_else(|| user_error("No destination specified and wasn't able to guess it"))?;
+    let wc_path = command.cwd().join(wc_path_str);
+    let wc_path_existed = match fs::create_dir(&wc_path) {
+        Ok(()) => false,
+        Err(err) if err.kind() == io::ErrorKind::AlreadyExists => true,
+        Err(err) => {
+            return Err(user_error_with_message(
+                format!("Failed to create {wc_path_str}"),
+                err,
+            ));
+        }
+    };
+    if wc_path_existed && !is_empty_dir(&wc_path) {
+        return Err(user_error(
+            "Destination path exists and is not an empty directory",
+        ));
+    }
+
+    // Canonicalize because fs::remove_dir_all() doesn't seem to like e.g.
+    // `/some/path/.`
+    let canonical_wc_path: PathBuf = wc_path
+        .canonicalize()
+        .map_err(|err| user_error_with_message(format!("Failed to create {wc_path_str}"), err))?;
+    let clone_result = do_git_clone(
+        ui,
+        command,
+        args.colocate,
+        remote_name,
+        &source,
+        &canonical_wc_path,
+    );
+    if clone_result.is_err() {
+        let clean_up_dirs = || -> io::Result<()> {
+            fs::remove_dir_all(canonical_wc_path.join(".jj"))?;
+            if args.colocate {
+                fs::remove_dir_all(canonical_wc_path.join(".git"))?;
+            }
+            if !wc_path_existed {
+                fs::remove_dir(&canonical_wc_path)?;
+            }
+            Ok(())
+        };
+        if let Err(err) = clean_up_dirs() {
+            writeln!(
+                ui.warning_default(),
+                "Failed to clean up {}: {}",
+                canonical_wc_path.display(),
+                err
+            )
+            .ok();
+        }
+    }
+
+    let (mut workspace_command, stats) = clone_result?;
+    if let Some(default_branch) = &stats.default_branch {
+        let default_branch_remote_ref = workspace_command
+            .repo()
+            .view()
+            .get_remote_branch(default_branch, remote_name);
+        if let Some(commit_id) = default_branch_remote_ref.target.as_normal().cloned() {
+            let mut checkout_tx = workspace_command.start_transaction();
+            // For convenience, create local branch as Git would do.
+            checkout_tx
+                .mut_repo()
+                .track_remote_branch(default_branch, remote_name);
+            if let Ok(commit) = checkout_tx.repo().store().get_commit(&commit_id) {
+                checkout_tx.check_out(&commit)?;
+            }
+            checkout_tx.finish(ui, "check out git remote's default branch")?;
+        }
+    }
+    Ok(())
+}
+
+fn do_git_clone(
+    ui: &mut Ui,
+    command: &CommandHelper,
+    colocate: bool,
+    remote_name: &str,
+    source: &str,
+    wc_path: &Path,
+) -> Result<(WorkspaceCommandHelper, GitFetchStats), CommandError> {
+    let (workspace, repo) = if colocate {
+        Workspace::init_colocated_git(command.settings(), wc_path)?
+    } else {
+        Workspace::init_internal_git(command.settings(), wc_path)?
+    };
+    let git_repo = get_git_repo(repo.store())?;
+    writeln!(
+        ui.status(),
+        r#"Fetching into new repo in "{}""#,
+        wc_path.display()
+    )?;
+    let mut workspace_command = command.for_loaded_repo(ui, workspace, repo)?;
+    maybe_add_gitignore(&workspace_command)?;
+    git_repo.remote(remote_name, source).unwrap();
+    let mut fetch_tx = workspace_command.start_transaction();
+
+    let stats = with_remote_git_callbacks(ui, None, |cb| {
+        git::fetch(
+            fetch_tx.mut_repo(),
+            &git_repo,
+            remote_name,
+            &[StringPattern::everything()],
+            cb,
+            &command.settings().git_settings(),
+        )
+    })
+    .map_err(|err| match err {
+        GitFetchError::NoSuchRemote(_) => {
+            panic!("shouldn't happen as we just created the git remote")
+        }
+        GitFetchError::GitImportError(err) => CommandError::from(err),
+        GitFetchError::InternalGitError(err) => map_git_error(err),
+        GitFetchError::InvalidBranchPattern => {
+            unreachable!("we didn't provide any globs")
+        }
+    })?;
+    print_git_import_stats(ui, fetch_tx.repo(), &stats.import_stats, true)?;
+    fetch_tx.finish(ui, "fetch from git remote into empty repo")?;
+    Ok((workspace_command, stats))
+}
diff --git a/cli/src/commands/git/export.rs b/cli/src/commands/git/export.rs
new file mode 100644
index 0000000000..0fa67b69a7
--- /dev/null
+++ b/cli/src/commands/git/export.rs
@@ -0,0 +1,37 @@
+// Copyright 2020-2023 The Jujutsu Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use jj_lib::git;
+
+use crate::cli_util::CommandHelper;
+use crate::command_error::CommandError;
+use crate::git_util::print_failed_git_export;
+use crate::ui::Ui;
+
+/// Update the underlying Git repo with changes made in the repo
+#[derive(clap::Args, Clone, Debug)]
+pub struct GitExportArgs {}
+
+pub fn cmd_git_export(
+    ui: &mut Ui,
+    command: &CommandHelper,
+    _args: &GitExportArgs,
+) -> Result<(), CommandError> {
+    let mut workspace_command = command.workspace_helper(ui)?;
+    let mut tx = workspace_command.start_transaction();
+    let failed_branches = git::export_refs(tx.mut_repo())?;
+    tx.finish(ui, "export git refs")?;
+    print_failed_git_export(ui, &failed_branches)?;
+    Ok(())
+}
diff --git a/cli/src/commands/git/fetch.rs b/cli/src/commands/git/fetch.rs
new file mode 100644
index 0000000000..88efbce307
--- /dev/null
+++ b/cli/src/commands/git/fetch.rs
@@ -0,0 +1,135 @@
+// Copyright 2020-2023 The Jujutsu Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use itertools::Itertools;
+use jj_lib::git::{self, GitFetchError};
+use jj_lib::repo::Repo;
+use jj_lib::settings::{ConfigResultExt as _, UserSettings};
+use jj_lib::str_util::StringPattern;
+
+use crate::cli_util::CommandHelper;
+use crate::command_error::{user_error, user_error_with_hint, CommandError};
+use crate::commands::git::{get_single_remote, map_git_error};
+use crate::git_util::{get_git_repo, print_git_import_stats, with_remote_git_callbacks};
+use crate::ui::Ui;
+
+/// Fetch from a Git remote
+///
+/// If a working-copy commit gets abandoned, it will be given a new, empty
+/// commit. This is true in general; it is not specific to this command.
+#[derive(clap::Args, Clone, Debug)]
+pub struct GitFetchArgs {
+    /// Fetch only some of the branches
+    ///
+    /// By default, the specified name matches exactly. Use `glob:` prefix to
+    /// expand `*` as a glob. The other wildcard characters aren't supported.
+    #[arg(long, short, default_value = "glob:*", value_parser = StringPattern::parse)]
+    branch: Vec<StringPattern>,
+    /// The remote to fetch from (only named remotes are supported, can be
+    /// repeated)
+    #[arg(long = "remote", value_name = "remote")]
+    remotes: Vec<String>,
+    /// Fetch from all remotes
+    #[arg(long, conflicts_with = "remotes")]
+    all_remotes: bool,
+}
+
+#[tracing::instrument(skip(ui, command))]
+pub fn cmd_git_fetch(
+    ui: &mut Ui,
+    command: &CommandHelper,
+    args: &GitFetchArgs,
+) -> Result<(), CommandError> {
+    let mut workspace_command = command.workspace_helper(ui)?;
+    let git_repo = get_git_repo(workspace_command.repo().store())?;
+    let remotes = if args.all_remotes {
+        get_all_remotes(&git_repo)?
+    } else if args.remotes.is_empty() {
+        get_default_fetch_remotes(ui, command.settings(), &git_repo)?
+    } else {
+        args.remotes.clone()
+    };
+    let mut tx = workspace_command.start_transaction();
+    for remote in &remotes {
+        let stats = with_remote_git_callbacks(ui, None, |cb| {
+            git::fetch(
+                tx.mut_repo(),
+                &git_repo,
+                remote,
+                &args.branch,
+                cb,
+                &command.settings().git_settings(),
+            )
+        })
+        .map_err(|err| match err {
+            GitFetchError::InvalidBranchPattern => {
+                if args
+                    .branch
+                    .iter()
+                    .any(|pattern| pattern.as_exact().map_or(false, |s| s.contains('*')))
+                {
+                    user_error_with_hint(
+                        err,
+                        "Prefix the pattern with `glob:` to expand `*` as a glob",
+                    )
+                } else {
+                    user_error(err)
+                }
+            }
+            GitFetchError::GitImportError(err) => err.into(),
+            GitFetchError::InternalGitError(err) => map_git_error(err),
+            _ => user_error(err),
+        })?;
+        print_git_import_stats(ui, tx.repo(), &stats.import_stats, true)?;
+    }
+    tx.finish(
+        ui,
+        format!("fetch from git remote(s) {}", remotes.iter().join(",")),
+    )?;
+    Ok(())
+}
+
+const DEFAULT_REMOTE: &str = "origin";
+
+fn get_default_fetch_remotes(
+    ui: &Ui,
+    settings: &UserSettings,
+    git_repo: &git2::Repository,
+) -> Result<Vec<String>, CommandError> {
+    const KEY: &str = "git.fetch";
+    if let Ok(remotes) = settings.config().get(KEY) {
+        Ok(remotes)
+    } else if let Some(remote) = settings.config().get_string(KEY).optional()? {
+        Ok(vec![remote])
+    } else if let Some(remote) = get_single_remote(git_repo)? {
+        // if nothing was explicitly configured, try to guess
+        if remote != DEFAULT_REMOTE {
+            writeln!(
+                ui.hint_default(),
+                "Fetching from the only existing remote: {remote}"
+            )?;
+        }
+        Ok(vec![remote])
+    } else {
+        Ok(vec![DEFAULT_REMOTE.to_owned()])
+    }
+}
+
+fn get_all_remotes(git_repo: &git2::Repository) -> Result<Vec<String>, CommandError> {
+    let git_remotes = git_repo.remotes()?;
+    Ok(git_remotes
+        .iter()
+        .filter_map(|x| x.map(ToOwned::to_owned))
+        .collect())
+}
diff --git a/cli/src/commands/git/import.rs b/cli/src/commands/git/import.rs
new file mode 100644
index 0000000000..a10aa6b1e0
--- /dev/null
+++ b/cli/src/commands/git/import.rs
@@ -0,0 +1,43 @@
+// Copyright 2020-2023 The Jujutsu Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use jj_lib::git;
+
+use crate::cli_util::CommandHelper;
+use crate::command_error::CommandError;
+use crate::git_util::print_git_import_stats;
+use crate::ui::Ui;
+
+/// Update repo with changes made in the underlying Git repo
+///
+/// If a working-copy commit gets abandoned, it will be given a new, empty
+/// commit. This is true in general; it is not specific to this command.
+#[derive(clap::Args, Clone, Debug)]
+pub struct GitImportArgs {}
+
+pub fn cmd_git_import(
+    ui: &mut Ui,
+    command: &CommandHelper,
+    _args: &GitImportArgs,
+) -> Result<(), CommandError> {
+    let mut workspace_command = command.workspace_helper(ui)?;
+    let mut tx = workspace_command.start_transaction();
+    // In non-colocated repo, HEAD@git will never be moved internally by jj.
+    // That's why cmd_git_export() doesn't export the HEAD ref.
+    git::import_head(tx.mut_repo())?;
+    let stats = git::import_refs(tx.mut_repo(), &command.settings().git_settings())?;
+    print_git_import_stats(ui, tx.repo(), &stats, true)?;
+    tx.finish(ui, "import git refs")?;
+    Ok(())
+}
diff --git a/cli/src/commands/git/init.rs b/cli/src/commands/git/init.rs
new file mode 100644
index 0000000000..2d0257e1b3
--- /dev/null
+++ b/cli/src/commands/git/init.rs
@@ -0,0 +1,212 @@
+// Copyright 2020-2023 The Jujutsu Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use std::io::Write;
+use std::path::{Path, PathBuf};
+use std::sync::Arc;
+
+use jj_lib::repo::{ReadonlyRepo, Repo};
+use jj_lib::workspace::Workspace;
+use jj_lib::{file_util, git};
+
+use crate::cli_util::{print_trackable_remote_branches, start_repo_transaction, CommandHelper};
+use crate::command_error::{user_error_with_hint, user_error_with_message, CommandError};
+use crate::commands::git::maybe_add_gitignore;
+use crate::git_util::{
+    is_colocated_git_workspace, print_failed_git_export, print_git_import_stats,
+};
+use crate::ui::Ui;
+
+/// Create a new Git backed repo.
+#[derive(clap::Args, Clone, Debug)]
+pub struct GitInitArgs {
+    /// The destination directory where the `jj` repo will be created.
+    /// If the directory does not exist, it will be created.
+    /// If no directory is given, the current directory is used.
+    ///
+    /// By default the `git` repo is under `$destination/.jj`
+    #[arg(default_value = ".", value_hint = clap::ValueHint::DirPath)]
+    destination: String,
+
+    /// Specifies that the `jj` repo should also be a valid
+    /// `git` repo, allowing the use of both `jj` and `git` commands
+    /// in the same directory.
+    ///
+    /// This is done by placing the backing git repo into a `.git` directory in
+    /// the root of the `jj` repo along with the `.jj` directory. If the `.git`
+    /// directory already exists, all the existing commits will be imported.
+    ///
+    /// This option is mutually exclusive with `--git-repo`.
+    #[arg(long, conflicts_with = "git_repo")]
+    colocate: bool,
+
+    /// Specifies a path to an **existing** git repository to be
+    /// used as the backing git repo for the newly created `jj` repo.
+    ///
+    /// If the specified `--git-repo` path happens to be the same as
+    /// the `jj` repo path (both .jj and .git directories are in the
+    /// same working directory), then both `jj` and `git` commands
+    /// will work on the same repo. This is called a co-located repo.
+    ///
+    /// This option is mutually exclusive with `--colocate`.
+    #[arg(long, conflicts_with = "colocate", value_hint = clap::ValueHint::DirPath)]
+    git_repo: Option<String>,
+}
+
+pub fn cmd_git_init(
+    ui: &mut Ui,
+    command: &CommandHelper,
+    args: &GitInitArgs,
+) -> Result<(), CommandError> {
+    let cwd = command.cwd();
+    let wc_path = cwd.join(&args.destination);
+    let wc_path = file_util::create_or_reuse_dir(&wc_path)
+        .and_then(|_| wc_path.canonicalize())
+        .map_err(|e| user_error_with_message("Failed to create workspace", e))?;
+
+    do_init(
+        ui,
+        command,
+        &wc_path,
+        args.colocate,
+        args.git_repo.as_deref(),
+    )?;
+
+    let relative_wc_path = file_util::relative_path(cwd, &wc_path);
+    writeln!(
+        ui.status(),
+        r#"Initialized repo in "{}""#,
+        relative_wc_path.display()
+    )?;
+
+    Ok(())
+}
+
+pub fn do_init(
+    ui: &mut Ui,
+    command: &CommandHelper,
+    workspace_root: &Path,
+    colocate: bool,
+    git_repo: Option<&str>,
+) -> Result<(), CommandError> {
+    #[derive(Clone, Debug)]
+    enum GitInitMode {
+        Colocate,
+        External(PathBuf),
+        Internal,
+    }
+
+    let colocated_git_repo_path = workspace_root.join(".git");
+    let init_mode = if colocate {
+        if colocated_git_repo_path.exists() {
+            GitInitMode::External(colocated_git_repo_path)
+        } else {
+            GitInitMode::Colocate
+        }
+    } else if let Some(path_str) = git_repo {
+        let mut git_repo_path = command.cwd().join(path_str);
+        if !git_repo_path.ends_with(".git") {
+            git_repo_path.push(".git");
+            // Undo if .git doesn't exist - likely a bare repo.
+            if !git_repo_path.exists() {
+                git_repo_path.pop();
+            }
+        }
+        GitInitMode::External(git_repo_path)
+    } else {
+        if colocated_git_repo_path.exists() {
+            return Err(user_error_with_hint(
+                "Did not create a jj repo because there is an existing Git repo in this directory.",
+                "To create a repo backed by the existing Git repo, run `jj git init --colocate` \
+                 instead.",
+            ));
+        }
+        GitInitMode::Internal
+    };
+
+    match &init_mode {
+        GitInitMode::Colocate => {
+            let (workspace, repo) =
+                Workspace::init_colocated_git(command.settings(), workspace_root)?;
+            let workspace_command = command.for_loaded_repo(ui, workspace, repo)?;
+            maybe_add_gitignore(&workspace_command)?;
+        }
+        GitInitMode::External(git_repo_path) => {
+            let (workspace, repo) =
+                Workspace::init_external_git(command.settings(), workspace_root, git_repo_path)?;
+            // Import refs first so all the reachable commits are indexed in
+            // chronological order.
+            let colocated = is_colocated_git_workspace(&workspace, &repo);
+            let repo = init_git_refs(ui, command, repo, colocated)?;
+            let mut workspace_command = command.for_loaded_repo(ui, workspace, repo)?;
+            maybe_add_gitignore(&workspace_command)?;
+            workspace_command.maybe_snapshot(ui)?;
+            if !workspace_command.working_copy_shared_with_git() {
+                let mut tx = workspace_command.start_transaction();
+                jj_lib::git::import_head(tx.mut_repo())?;
+                if let Some(git_head_id) = tx.mut_repo().view().git_head().as_normal().cloned() {
+                    let git_head_commit = tx.mut_repo().store().get_commit(&git_head_id)?;
+                    tx.check_out(&git_head_commit)?;
+                }
+                if tx.mut_repo().has_changes() {
+                    tx.finish(ui, "import git head")?;
+                }
+            }
+            print_trackable_remote_branches(ui, workspace_command.repo().view())?;
+        }
+        GitInitMode::Internal => {
+            Workspace::init_internal_git(command.settings(), workspace_root)?;
+        }
+    }
+    Ok(())
+}
+
+/// Imports branches and tags from the underlying Git repo, exports changes if
+/// the repo is colocated.
+///
+/// This is similar to `WorkspaceCommandHelper::import_git_refs()`, but never
+/// moves the Git HEAD to the working copy parent.
+fn init_git_refs(
+    ui: &mut Ui,
+    command: &CommandHelper,
+    repo: Arc<ReadonlyRepo>,
+    colocated: bool,
+) -> Result<Arc<ReadonlyRepo>, CommandError> {
+    let mut tx = start_repo_transaction(&repo, command.settings(), command.string_args());
+    // There should be no old refs to abandon, but enforce it.
+    let mut git_settings = command.settings().git_settings();
+    git_settings.abandon_unreachable_commits = false;
+    let stats = git::import_some_refs(
+        tx.mut_repo(),
+        &git_settings,
+        // Initial import shouldn't fail because of reserved remote name.
+        |ref_name| !git::is_reserved_git_remote_ref(ref_name),
+    )?;
+    if !tx.mut_repo().has_changes() {
+        return Ok(repo);
+    }
+    print_git_import_stats(ui, tx.repo(), &stats, false)?;
+    if colocated {
+        // If git.auto-local-branch = true, local branches could be created for
+        // the imported remote branches.
+        let failed_branches = git::export_refs(tx.mut_repo())?;
+        print_failed_git_export(ui, &failed_branches)?;
+    }
+    let repo = tx.commit("import git refs");
+    writeln!(
+        ui.status(),
+        "Done importing changes from the underlying Git repo."
+    )?;
+    Ok(repo)
+}
diff --git a/cli/src/commands/git/mod.rs b/cli/src/commands/git/mod.rs
new file mode 100644
index 0000000000..4b4fdd09f4
--- /dev/null
+++ b/cli/src/commands/git/mod.rs
@@ -0,0 +1,114 @@
+// Copyright 2020-2023 The Jujutsu Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+pub mod clone;
+pub mod export;
+pub mod fetch;
+pub mod import;
+pub mod init;
+pub mod push;
+pub mod remote;
+pub mod submodule;
+
+use clap::Subcommand;
+
+use self::clone::{cmd_git_clone, GitCloneArgs};
+use self::export::{cmd_git_export, GitExportArgs};
+use self::fetch::{cmd_git_fetch, GitFetchArgs};
+use self::import::{cmd_git_import, GitImportArgs};
+use self::init::{cmd_git_init, GitInitArgs};
+use self::push::{cmd_git_push, GitPushArgs};
+use self::remote::{cmd_git_remote, RemoteCommand};
+use self::submodule::{cmd_git_submodule, GitSubmoduleCommand};
+use crate::cli_util::{CommandHelper, WorkspaceCommandHelper};
+use crate::command_error::{
+    user_error, user_error_with_hint, user_error_with_message, CommandError,
+};
+use crate::ui::Ui;
+
+/// Commands for working with Git remotes and the underlying Git repo
+///
+/// For a comparison with Git, including a table of commands, see
+/// https://github.com/martinvonz/jj/blob/main/docs/git-comparison.md.
+#[derive(Subcommand, Clone, Debug)]
+pub enum GitCommand {
+    Clone(GitCloneArgs),
+    Export(GitExportArgs),
+    Fetch(GitFetchArgs),
+    Import(GitImportArgs),
+    Init(GitInitArgs),
+    Push(GitPushArgs),
+    #[command(subcommand)]
+    Remote(RemoteCommand),
+    #[command(subcommand, hide = true)]
+    Submodule(GitSubmoduleCommand),
+}
+
+pub fn cmd_git(
+    ui: &mut Ui,
+    command: &CommandHelper,
+    subcommand: &GitCommand,
+) -> Result<(), CommandError> {
+    match subcommand {
+        GitCommand::Clone(args) => cmd_git_clone(ui, command, args),
+        GitCommand::Export(args) => cmd_git_export(ui, command, args),
+        GitCommand::Fetch(args) => cmd_git_fetch(ui, command, args),
+        GitCommand::Import(args) => cmd_git_import(ui, command, args),
+        GitCommand::Init(args) => cmd_git_init(ui, command, args),
+        GitCommand::Push(args) => cmd_git_push(ui, command, args),
+        GitCommand::Remote(args) => cmd_git_remote(ui, command, args),
+        GitCommand::Submodule(args) => cmd_git_submodule(ui, command, args),
+    }
+}
+
+fn map_git_error(err: git2::Error) -> CommandError {
+    if err.class() == git2::ErrorClass::Ssh {
+        let hint =
+            if err.code() == git2::ErrorCode::Certificate && std::env::var_os("HOME").is_none() {
+                "The HOME environment variable is not set, and might be required for Git to \
+                 successfully load certificates. Try setting it to the path of a directory that \
+                 contains a `.ssh` directory."
+            } else {
+                "Jujutsu uses libssh2, which doesn't respect ~/.ssh/config. Does `ssh -F \
+                 /dev/null` to the host work?"
+            };
+
+        user_error_with_hint(err, hint)
+    } else {
+        user_error(err.to_string())
+    }
+}
+
+pub fn maybe_add_gitignore(workspace_command: &WorkspaceCommandHelper) -> Result<(), CommandError> {
+    if workspace_command.working_copy_shared_with_git() {
+        std::fs::write(
+            workspace_command
+                .workspace_root()
+                .join(".jj")
+                .join(".gitignore"),
+            "/*\n",
+        )
+        .map_err(|e| user_error_with_message("Failed to write .jj/.gitignore file", e))
+    } else {
+        Ok(())
+    }
+}
+
+fn get_single_remote(git_repo: &git2::Repository) -> Result<Option<String>, CommandError> {
+    let git_remotes = git_repo.remotes()?;
+    Ok(match git_remotes.len() {
+        1 => git_remotes.get(0).map(ToOwned::to_owned),
+        _ => None,
+    })
+}
diff --git a/cli/src/commands/git/push.rs b/cli/src/commands/git/push.rs
new file mode 100644
index 0000000000..24b87daa0b
--- /dev/null
+++ b/cli/src/commands/git/push.rs
@@ -0,0 +1,592 @@
+// Copyright 2020-2023 The Jujutsu Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use std::collections::{HashMap, HashSet};
+use std::io::Write;
+use std::{fmt, io};
+
+use clap::ArgGroup;
+use itertools::Itertools;
+use jj_lib::git::{self, GitBranchPushTargets, GitPushError};
+use jj_lib::object_id::ObjectId;
+use jj_lib::op_store::RefTarget;
+use jj_lib::refs::{
+    classify_branch_push_action, BranchPushAction, BranchPushUpdate, LocalAndRemoteRef,
+};
+use jj_lib::repo::Repo;
+use jj_lib::revset::RevsetExpression;
+use jj_lib::settings::{ConfigResultExt as _, UserSettings};
+use jj_lib::str_util::StringPattern;
+use jj_lib::view::View;
+
+use crate::cli_util::{
+    short_change_hash, short_commit_hash, CommandHelper, RevisionArg, WorkspaceCommandHelper,
+    WorkspaceCommandTransaction,
+};
+use crate::command_error::{user_error, user_error_with_hint, CommandError};
+use crate::commands::git::{get_single_remote, map_git_error};
+use crate::git_util::{get_git_repo, with_remote_git_callbacks, GitSidebandProgressMessageWriter};
+use crate::revset_util;
+use crate::ui::Ui;
+
+/// Push to a Git remote
+///
+/// By default, pushes any branches pointing to
+/// `remote_branches(remote=<remote>)..@`. Use `--branch` to push specific
+/// branches. Use `--all` to push all branches. Use `--change` to generate
+/// branch names based on the change IDs of specific commits.
+///
+/// Before the command actually moves, creates, or deletes a remote branch, it
+/// makes several [safety checks]. If there is a problem, you may need to run
+/// `jj git fetch --remote <remote name>` and/or resolve some [branch
+/// conflicts].
+///
+/// [safety checks]:
+///     https://martinvonz.github.io/jj/latest/branches/#pushing-branches-safety-checks
+///
+/// [branch conflicts]:
+///     https://martinvonz.github.io/jj/latest/branches/#conflicts
+
+#[derive(clap::Args, Clone, Debug)]
+#[command(group(ArgGroup::new("specific").args(&["branch", "change", "revisions"]).multiple(true)))]
+#[command(group(ArgGroup::new("what").args(&["all", "deleted", "tracked"]).conflicts_with("specific")))]
+pub struct GitPushArgs {
+    /// The remote to push to (only named remotes are supported)
+    #[arg(long)]
+    remote: Option<String>,
+    /// Push only this branch, or branches matching a pattern (can be repeated)
+    ///
+    /// By default, the specified name matches exactly. Use `glob:` prefix to
+    /// select branches by wildcard pattern. For details, see
+    /// https://martinvonz.github.io/jj/latest/revsets#string-patterns.
+    #[arg(long, short, value_parser = StringPattern::parse)]
+    branch: Vec<StringPattern>,
+    /// Push all branches (including deleted branches)
+    #[arg(long)]
+    all: bool,
+    /// Push all tracked branches (including deleted branches)
+    ///
+    /// This usually means that the branch was already pushed to or fetched from
+    /// the relevant remote. For details, see
+    /// https://martinvonz.github.io/jj/latest/branches#remotes-and-tracked-branches
+    #[arg(long)]
+    tracked: bool,
+    /// Push all deleted branches
+    ///
+    /// Only tracked branches can be successfully deleted on the remote. A
+    /// warning will be printed if any untracked branches on the remote
+    /// correspond to missing local branches.
+    #[arg(long)]
+    deleted: bool,
+    /// Allow pushing commits with empty descriptions
+    #[arg(long)]
+    allow_empty_description: bool,
+    /// Push branches pointing to these commits (can be repeated)
+    #[arg(long, short)]
+    revisions: Vec<RevisionArg>,
+    /// Push this commit by creating a branch based on its change ID (can be
+    /// repeated)
+    #[arg(long, short)]
+    change: Vec<RevisionArg>,
+    /// Only display what will change on the remote
+    #[arg(long)]
+    dry_run: bool,
+}
+
+fn make_branch_term(branch_names: &[impl fmt::Display]) -> String {
+    match branch_names {
+        [branch_name] => format!("branch {}", branch_name),
+        branch_names => format!("branches {}", branch_names.iter().join(", ")),
+    }
+}
+
+const DEFAULT_REMOTE: &str = "origin";
+
+#[derive(Clone, Copy, Debug, Eq, PartialEq)]
+enum BranchMoveDirection {
+    Forward,
+    Backward,
+    Sideways,
+}
+
+pub fn cmd_git_push(
+    ui: &mut Ui,
+    command: &CommandHelper,
+    args: &GitPushArgs,
+) -> Result<(), CommandError> {
+    let mut workspace_command = command.workspace_helper(ui)?;
+    let git_repo = get_git_repo(workspace_command.repo().store())?;
+
+    let remote = if let Some(name) = &args.remote {
+        name.clone()
+    } else {
+        get_default_push_remote(ui, command.settings(), &git_repo)?
+    };
+
+    let repo = workspace_command.repo().clone();
+    let mut tx = workspace_command.start_transaction();
+    let tx_description;
+    let mut branch_updates = vec![];
+    if args.all {
+        for (branch_name, targets) in repo.view().local_remote_branches(&remote) {
+            match classify_branch_update(branch_name, &remote, targets) {
+                Ok(Some(update)) => branch_updates.push((branch_name.to_owned(), update)),
+                Ok(None) => {}
+                Err(reason) => reason.print(ui)?,
+            }
+        }
+        tx_description = format!("push all branches to git remote {remote}");
+    } else if args.tracked {
+        for (branch_name, targets) in repo.view().local_remote_branches(&remote) {
+            if !targets.remote_ref.is_tracking() {
+                continue;
+            }
+            match classify_branch_update(branch_name, &remote, targets) {
+                Ok(Some(update)) => branch_updates.push((branch_name.to_owned(), update)),
+                Ok(None) => {}
+                Err(reason) => reason.print(ui)?,
+            }
+        }
+        tx_description = format!("push all tracked branches to git remote {remote}");
+    } else if args.deleted {
+        for (branch_name, targets) in repo.view().local_remote_branches(&remote) {
+            if targets.local_target.is_present() {
+                continue;
+            }
+            match classify_branch_update(branch_name, &remote, targets) {
+                Ok(Some(update)) => branch_updates.push((branch_name.to_owned(), update)),
+                Ok(None) => {}
+                Err(reason) => reason.print(ui)?,
+            }
+        }
+        tx_description = format!("push all deleted branches to git remote {remote}");
+    } else {
+        let mut seen_branches: HashSet<&str> = HashSet::new();
+
+        // Process --change branches first because matching branches can be moved.
+        let change_branch_names = update_change_branches(
+            ui,
+            &mut tx,
+            &args.change,
+            &command.settings().push_branch_prefix(),
+        )?;
+        let change_branches = change_branch_names.iter().map(|branch_name| {
+            let targets = LocalAndRemoteRef {
+                local_target: tx.repo().view().get_local_branch(branch_name),
+                remote_ref: tx.repo().view().get_remote_branch(branch_name, &remote),
+            };
+            (branch_name.as_ref(), targets)
+        });
+        let branches_by_name = find_branches_to_push(repo.view(), &args.branch, &remote)?;
+        for (branch_name, targets) in change_branches.chain(branches_by_name.iter().copied()) {
+            if !seen_branches.insert(branch_name) {
+                continue;
+            }
+            match classify_branch_update(branch_name, &remote, targets) {
+                Ok(Some(update)) => branch_updates.push((branch_name.to_owned(), update)),
+                Ok(None) => writeln!(
+                    ui.status(),
+                    "Branch {branch_name}@{remote} already matches {branch_name}",
+                )?,
+                Err(reason) => return Err(reason.into()),
+            }
+        }
+
+        let use_default_revset =
+            args.branch.is_empty() && args.change.is_empty() && args.revisions.is_empty();
+        let branches_targeted = find_branches_targeted_by_revisions(
+            ui,
+            tx.base_workspace_helper(),
+            &remote,
+            &args.revisions,
+            use_default_revset,
+        )?;
+        for &(branch_name, targets) in &branches_targeted {
+            if !seen_branches.insert(branch_name) {
+                continue;
+            }
+            match classify_branch_update(branch_name, &remote, targets) {
+                Ok(Some(update)) => branch_updates.push((branch_name.to_owned(), update)),
+                Ok(None) => {}
+                Err(reason) => reason.print(ui)?,
+            }
+        }
+
+        tx_description = format!(
+            "push {} to git remote {}",
+            make_branch_term(
+                &branch_updates
+                    .iter()
+                    .map(|(branch, _)| branch.as_str())
+                    .collect_vec()
+            ),
+            &remote
+        );
+    }
+    if branch_updates.is_empty() {
+        writeln!(ui.status(), "Nothing changed.")?;
+        return Ok(());
+    }
+
+    let mut branch_push_direction = HashMap::new();
+    for (branch_name, update) in &branch_updates {
+        let BranchPushUpdate {
+            old_target: Some(old_target),
+            new_target: Some(new_target),
+        } = update
+        else {
+            continue;
+        };
+        assert_ne!(old_target, new_target);
+        branch_push_direction.insert(
+            branch_name.to_string(),
+            if repo.index().is_ancestor(old_target, new_target) {
+                BranchMoveDirection::Forward
+            } else if repo.index().is_ancestor(new_target, old_target) {
+                BranchMoveDirection::Backward
+            } else {
+                BranchMoveDirection::Sideways
+            },
+        );
+    }
+
+    // Check if there are conflicts in any commits we're about to push that haven't
+    // already been pushed.
+    let new_heads = branch_updates
+        .iter()
+        .filter_map(|(_, update)| update.new_target.clone())
+        .collect_vec();
+    let old_heads = repo
+        .view()
+        .remote_branches(&remote)
+        .flat_map(|(_, old_head)| old_head.target.added_ids())
+        .cloned()
+        .collect_vec();
+    // (old_heads | immutable_heads() | root())..new_heads
+    let commits_to_push = RevsetExpression::commits(old_heads)
+        .union(&revset_util::parse_immutable_heads_expression(
+            &tx.base_workspace_helper().revset_parse_context(),
+        )?)
+        .range(&RevsetExpression::commits(new_heads));
+    for commit in tx
+        .base_workspace_helper()
+        .attach_revset_evaluator(commits_to_push)?
+        .evaluate_to_commits()?
+    {
+        let commit = commit?;
+        let mut reasons = vec![];
+        if commit.description().is_empty() && !args.allow_empty_description {
+            reasons.push("it has no description");
+        }
+        if commit.author().name.is_empty()
+            || commit.author().name == UserSettings::USER_NAME_PLACEHOLDER
+            || commit.author().email.is_empty()
+            || commit.author().email == UserSettings::USER_EMAIL_PLACEHOLDER
+            || commit.committer().name.is_empty()
+            || commit.committer().name == UserSettings::USER_NAME_PLACEHOLDER
+            || commit.committer().email.is_empty()
+            || commit.committer().email == UserSettings::USER_EMAIL_PLACEHOLDER
+        {
+            reasons.push("it has no author and/or committer set");
+        }
+        if commit.has_conflict()? {
+            reasons.push("it has conflicts");
+        }
+        if !reasons.is_empty() {
+            return Err(user_error(format!(
+                "Won't push commit {} since {}",
+                short_commit_hash(commit.id()),
+                reasons.join(" and ")
+            )));
+        }
+    }
+
+    writeln!(ui.status(), "Branch changes to push to {}:", &remote)?;
+    for (branch_name, update) in &branch_updates {
+        match (&update.old_target, &update.new_target) {
+            (Some(old_target), Some(new_target)) => {
+                let old = short_commit_hash(old_target);
+                let new = short_commit_hash(new_target);
+                // TODO(ilyagr): Add color. Once there is color, "Move branch ... sideways" may
+                // read more naturally than "Move sideways branch ...". Without color, it's hard
+                // to see at a glance if one branch among many was moved sideways (say).
+                // TODO: People on Discord suggest "Move branch ... forward by n commits",
+                // possibly "Move branch ... sideways (X forward, Y back)".
+                let msg = match branch_push_direction.get(branch_name).unwrap() {
+                    BranchMoveDirection::Forward => {
+                        format!("Move forward branch {branch_name} from {old} to {new}")
+                    }
+                    BranchMoveDirection::Backward => {
+                        format!("Move backward branch {branch_name} from {old} to {new}")
+                    }
+                    BranchMoveDirection::Sideways => {
+                        format!("Move sideways branch {branch_name} from {old} to {new}")
+                    }
+                };
+                writeln!(ui.status(), "  {msg}")?;
+            }
+            (Some(old_target), None) => {
+                writeln!(
+                    ui.status(),
+                    "  Delete branch {branch_name} from {}",
+                    short_commit_hash(old_target)
+                )?;
+            }
+            (None, Some(new_target)) => {
+                writeln!(
+                    ui.status(),
+                    "  Add branch {branch_name} to {}",
+                    short_commit_hash(new_target)
+                )?;
+            }
+            (None, None) => {
+                panic!("Not pushing any change to branch {branch_name}");
+            }
+        }
+    }
+
+    if args.dry_run {
+        writeln!(ui.status(), "Dry-run requested, not pushing.")?;
+        return Ok(());
+    }
+
+    let targets = GitBranchPushTargets { branch_updates };
+    let mut writer = GitSidebandProgressMessageWriter::new(ui);
+    let mut sideband_progress_callback = |progress_message: &[u8]| {
+        _ = writer.write(ui, progress_message);
+    };
+    with_remote_git_callbacks(ui, Some(&mut sideband_progress_callback), |cb| {
+        git::push_branches(tx.mut_repo(), &git_repo, &remote, &targets, cb)
+    })
+    .map_err(|err| match err {
+        GitPushError::InternalGitError(err) => map_git_error(err),
+        GitPushError::RefInUnexpectedLocation(refs) => user_error_with_hint(
+            format!(
+                "Refusing to push a branch that unexpectedly moved on the remote. Affected refs: \
+                 {}",
+                refs.join(", ")
+            ),
+            "Try fetching from the remote, then make the branch point to where you want it to be, \
+             and push again.",
+        ),
+        _ => user_error(err),
+    })?;
+    writer.flush(ui)?;
+    tx.finish(ui, tx_description)?;
+    Ok(())
+}
+
+fn get_default_push_remote(
+    ui: &Ui,
+    settings: &UserSettings,
+    git_repo: &git2::Repository,
+) -> Result<String, CommandError> {
+    if let Some(remote) = settings.config().get_string("git.push").optional()? {
+        Ok(remote)
+    } else if let Some(remote) = get_single_remote(git_repo)? {
+        // similar to get_default_fetch_remotes
+        if remote != DEFAULT_REMOTE {
+            writeln!(
+                ui.hint_default(),
+                "Pushing to the only existing remote: {remote}"
+            )?;
+        }
+        Ok(remote)
+    } else {
+        Ok(DEFAULT_REMOTE.to_owned())
+    }
+}
+
+#[derive(Clone, Debug)]
+struct RejectedBranchUpdateReason {
+    message: String,
+    hint: Option<String>,
+}
+
+impl RejectedBranchUpdateReason {
+    fn print(&self, ui: &Ui) -> io::Result<()> {
+        writeln!(ui.warning_default(), "{}", self.message)?;
+        if let Some(hint) = &self.hint {
+            writeln!(ui.hint_default(), "{hint}")?;
+        }
+        Ok(())
+    }
+}
+
+impl From<RejectedBranchUpdateReason> for CommandError {
+    fn from(reason: RejectedBranchUpdateReason) -> Self {
+        let RejectedBranchUpdateReason { message, hint } = reason;
+        let mut cmd_err = user_error(message);
+        cmd_err.extend_hints(hint);
+        cmd_err
+    }
+}
+
+fn classify_branch_update(
+    branch_name: &str,
+    remote_name: &str,
+    targets: LocalAndRemoteRef,
+) -> Result<Option<BranchPushUpdate>, RejectedBranchUpdateReason> {
+    let push_action = classify_branch_push_action(targets);
+    match push_action {
+        BranchPushAction::AlreadyMatches => Ok(None),
+        BranchPushAction::LocalConflicted => Err(RejectedBranchUpdateReason {
+            message: format!("Branch {branch_name} is conflicted"),
+            hint: Some(
+                "Run `jj branch list` to inspect, and use `jj branch set` to fix it up.".to_owned(),
+            ),
+        }),
+        BranchPushAction::RemoteConflicted => Err(RejectedBranchUpdateReason {
+            message: format!("Branch {branch_name}@{remote_name} is conflicted"),
+            hint: Some("Run `jj git fetch` to update the conflicted remote branch.".to_owned()),
+        }),
+        BranchPushAction::RemoteUntracked => Err(RejectedBranchUpdateReason {
+            message: format!("Non-tracking remote branch {branch_name}@{remote_name} exists"),
+            hint: Some(format!(
+                "Run `jj branch track {branch_name}@{remote_name}` to import the remote branch."
+            )),
+        }),
+        BranchPushAction::Update(update) => Ok(Some(update)),
+    }
+}
+
+/// Creates or moves branches based on the change IDs.
+fn update_change_branches(
+    ui: &Ui,
+    tx: &mut WorkspaceCommandTransaction,
+    changes: &[RevisionArg],
+    branch_prefix: &str,
+) -> Result<Vec<String>, CommandError> {
+    if changes.is_empty() {
+        // NOTE: we don't want resolve_some_revsets_default_single to fail if the
+        // changes argument wasn't provided, so handle that
+        return Ok(vec![]);
+    }
+
+    let mut branch_names = Vec::new();
+    let workspace_command = tx.base_workspace_helper();
+    let all_commits = workspace_command.resolve_some_revsets_default_single(changes)?;
+
+    for commit in all_commits {
+        let workspace_command = tx.base_workspace_helper();
+        let short_change_id = short_change_hash(commit.change_id());
+        let mut branch_name = format!("{branch_prefix}{}", commit.change_id().hex());
+        let view = tx.base_repo().view();
+        if view.get_local_branch(&branch_name).is_absent() {
+            // A local branch with the full change ID doesn't exist already, so use the
+            // short ID if it's not ambiguous (which it shouldn't be most of the time).
+            if workspace_command
+                .resolve_single_rev(&RevisionArg::from(short_change_id.clone()))
+                .is_ok()
+            {
+                // Short change ID is not ambiguous, so update the branch name to use it.
+                branch_name = format!("{branch_prefix}{short_change_id}");
+            };
+        }
+        if view.get_local_branch(&branch_name).is_absent() {
+            writeln!(
+                ui.status(),
+                "Creating branch {branch_name} for revision {short_change_id}",
+            )?;
+        }
+        tx.mut_repo()
+            .set_local_branch_target(&branch_name, RefTarget::normal(commit.id().clone()));
+        branch_names.push(branch_name);
+    }
+    Ok(branch_names)
+}
+
+fn find_branches_to_push<'a>(
+    view: &'a View,
+    branch_patterns: &[StringPattern],
+    remote_name: &str,
+) -> Result<Vec<(&'a str, LocalAndRemoteRef<'a>)>, CommandError> {
+    let mut matching_branches = vec![];
+    let mut unmatched_patterns = vec![];
+    for pattern in branch_patterns {
+        let mut matches = view
+            .local_remote_branches_matching(pattern, remote_name)
+            .filter(|(_, targets)| {
+                // If the remote exists but is not tracking, the absent local shouldn't
+                // be considered a deleted branch.
+                targets.local_target.is_present() || targets.remote_ref.is_tracking()
+            })
+            .peekable();
+        if matches.peek().is_none() {
+            unmatched_patterns.push(pattern);
+        }
+        matching_branches.extend(matches);
+    }
+    match &unmatched_patterns[..] {
+        [] => Ok(matching_branches),
+        [pattern] if pattern.is_exact() => Err(user_error(format!("No such branch: {pattern}"))),
+        patterns => Err(user_error(format!(
+            "No matching branches for patterns: {}",
+            patterns.iter().join(", ")
+        ))),
+    }
+}
+
+fn find_branches_targeted_by_revisions<'a>(
+    ui: &Ui,
+    workspace_command: &'a WorkspaceCommandHelper,
+    remote_name: &str,
+    revisions: &[RevisionArg],
+    use_default_revset: bool,
+) -> Result<Vec<(&'a str, LocalAndRemoteRef<'a>)>, CommandError> {
+    let mut revision_commit_ids = HashSet::new();
+    if use_default_revset {
+        let Some(wc_commit_id) = workspace_command.get_wc_commit_id().cloned() else {
+            return Err(user_error("Nothing checked out in this workspace"));
+        };
+        let current_branches_expression = RevsetExpression::remote_branches(
+            StringPattern::everything(),
+            StringPattern::Exact(remote_name.to_owned()),
+        )
+        .range(&RevsetExpression::commit(wc_commit_id))
+        .intersection(&RevsetExpression::branches(StringPattern::everything()));
+        let current_branches_revset =
+            current_branches_expression.evaluate_programmatic(workspace_command.repo().as_ref())?;
+        revision_commit_ids.extend(current_branches_revset.iter());
+        if revision_commit_ids.is_empty() {
+            writeln!(
+                ui.warning_default(),
+                "No branches found in the default push revset: \
+                 remote_branches(remote={remote_name})..@"
+            )?;
+        }
+    }
+    for rev_arg in revisions {
+        let mut expression = workspace_command.parse_revset(rev_arg)?;
+        expression.intersect_with(&RevsetExpression::branches(StringPattern::everything()));
+        let mut commit_ids = expression.evaluate_to_commit_ids()?.peekable();
+        if commit_ids.peek().is_none() {
+            writeln!(
+                ui.warning_default(),
+                "No branches point to the specified revisions: {rev_arg}"
+            )?;
+        }
+        revision_commit_ids.extend(commit_ids);
+    }
+    let branches_targeted = workspace_command
+        .repo()
+        .view()
+        .local_remote_branches(remote_name)
+        .filter(|(_, targets)| {
+            let mut local_ids = targets.local_target.added_ids();
+            local_ids.any(|id| revision_commit_ids.contains(id))
+        })
+        .collect_vec();
+    Ok(branches_targeted)
+}
diff --git a/cli/src/commands/git/remote/add.rs b/cli/src/commands/git/remote/add.rs
new file mode 100644
index 0000000000..a66a7faac8
--- /dev/null
+++ b/cli/src/commands/git/remote/add.rs
@@ -0,0 +1,42 @@
+// Copyright 2020-2023 The Jujutsu Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use jj_lib::git;
+use jj_lib::repo::Repo;
+
+use crate::cli_util::CommandHelper;
+use crate::command_error::CommandError;
+use crate::git_util::get_git_repo;
+use crate::ui::Ui;
+
+/// Add a Git remote
+#[derive(clap::Args, Clone, Debug)]
+pub struct GitRemoteAddArgs {
+    /// The remote's name
+    remote: String,
+    /// The remote's URL
+    url: String,
+}
+
+pub fn cmd_git_remote_add(
+    ui: &mut Ui,
+    command: &CommandHelper,
+    args: &GitRemoteAddArgs,
+) -> Result<(), CommandError> {
+    let workspace_command = command.workspace_helper(ui)?;
+    let repo = workspace_command.repo();
+    let git_repo = get_git_repo(repo.store())?;
+    git::add_remote(&git_repo, &args.remote, &args.url)?;
+    Ok(())
+}
diff --git a/cli/src/commands/git/remote/list.rs b/cli/src/commands/git/remote/list.rs
new file mode 100644
index 0000000000..fee2d32f47
--- /dev/null
+++ b/cli/src/commands/git/remote/list.rs
@@ -0,0 +1,46 @@
+// Copyright 2020-2023 The Jujutsu Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use std::io::Write;
+
+use jj_lib::repo::Repo;
+
+use crate::cli_util::CommandHelper;
+use crate::command_error::CommandError;
+use crate::git_util::get_git_repo;
+use crate::ui::Ui;
+
+/// List Git remotes
+#[derive(clap::Args, Clone, Debug)]
+pub struct GitRemoteListArgs {}
+
+pub fn cmd_git_remote_list(
+    ui: &mut Ui,
+    command: &CommandHelper,
+    _args: &GitRemoteListArgs,
+) -> Result<(), CommandError> {
+    let workspace_command = command.workspace_helper(ui)?;
+    let repo = workspace_command.repo();
+    let git_repo = get_git_repo(repo.store())?;
+    for remote_name in git_repo.remotes()?.iter().flatten() {
+        let remote = git_repo.find_remote(remote_name)?;
+        writeln!(
+            ui.stdout(),
+            "{} {}",
+            remote_name,
+            remote.url().unwrap_or("<no URL>")
+        )?;
+    }
+    Ok(())
+}
diff --git a/cli/src/commands/git/remote/mod.rs b/cli/src/commands/git/remote/mod.rs
new file mode 100644
index 0000000000..659fd82f6e
--- /dev/null
+++ b/cli/src/commands/git/remote/mod.rs
@@ -0,0 +1,56 @@
+// Copyright 2020-2023 The Jujutsu Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+pub mod add;
+pub mod list;
+pub mod remove;
+pub mod rename;
+pub mod set_url;
+
+use clap::Subcommand;
+
+use self::add::{cmd_git_remote_add, GitRemoteAddArgs};
+use self::list::{cmd_git_remote_list, GitRemoteListArgs};
+use self::remove::{cmd_git_remote_remove, GitRemoteRemoveArgs};
+use self::rename::{cmd_git_remote_rename, GitRemoteRenameArgs};
+use self::set_url::{cmd_git_remote_set_url, GitRemoteSetUrlArgs};
+use crate::cli_util::CommandHelper;
+use crate::command_error::CommandError;
+use crate::ui::Ui;
+
+/// Manage Git remotes
+///
+/// The Git repo will be a bare git repo stored inside the `.jj/` directory.
+#[derive(Subcommand, Clone, Debug)]
+pub enum RemoteCommand {
+    Add(GitRemoteAddArgs),
+    List(GitRemoteListArgs),
+    Remove(GitRemoteRemoveArgs),
+    Rename(GitRemoteRenameArgs),
+    SetUrl(GitRemoteSetUrlArgs),
+}
+
+pub fn cmd_git_remote(
+    ui: &mut Ui,
+    command: &CommandHelper,
+    subcommand: &RemoteCommand,
+) -> Result<(), CommandError> {
+    match subcommand {
+        RemoteCommand::Add(args) => cmd_git_remote_add(ui, command, args),
+        RemoteCommand::List(args) => cmd_git_remote_list(ui, command, args),
+        RemoteCommand::Remove(args) => cmd_git_remote_remove(ui, command, args),
+        RemoteCommand::Rename(args) => cmd_git_remote_rename(ui, command, args),
+        RemoteCommand::SetUrl(args) => cmd_git_remote_set_url(ui, command, args),
+    }
+}
diff --git a/cli/src/commands/git/remote/remove.rs b/cli/src/commands/git/remote/remove.rs
new file mode 100644
index 0000000000..7a0125d7a9
--- /dev/null
+++ b/cli/src/commands/git/remote/remove.rs
@@ -0,0 +1,45 @@
+// Copyright 2020-2023 The Jujutsu Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use jj_lib::git;
+use jj_lib::repo::Repo;
+
+use crate::cli_util::CommandHelper;
+use crate::command_error::CommandError;
+use crate::git_util::get_git_repo;
+use crate::ui::Ui;
+
+/// Remove a Git remote and forget its branches
+#[derive(clap::Args, Clone, Debug)]
+pub struct GitRemoteRemoveArgs {
+    /// The remote's name
+    remote: String,
+}
+
+pub fn cmd_git_remote_remove(
+    ui: &mut Ui,
+    command: &CommandHelper,
+    args: &GitRemoteRemoveArgs,
+) -> Result<(), CommandError> {
+    let mut workspace_command = command.workspace_helper(ui)?;
+    let repo = workspace_command.repo();
+    let git_repo = get_git_repo(repo.store())?;
+    let mut tx = workspace_command.start_transaction();
+    git::remove_remote(tx.mut_repo(), &git_repo, &args.remote)?;
+    if tx.mut_repo().has_changes() {
+        tx.finish(ui, format!("remove git remote {}", &args.remote))
+    } else {
+        Ok(()) // Do not print "Nothing changed."
+    }
+}
diff --git a/cli/src/commands/git/remote/rename.rs b/cli/src/commands/git/remote/rename.rs
new file mode 100644
index 0000000000..b02534062a
--- /dev/null
+++ b/cli/src/commands/git/remote/rename.rs
@@ -0,0 +1,50 @@
+// Copyright 2020-2023 The Jujutsu Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use jj_lib::git;
+use jj_lib::repo::Repo;
+
+use crate::cli_util::CommandHelper;
+use crate::command_error::CommandError;
+use crate::git_util::get_git_repo;
+use crate::ui::Ui;
+
+/// Rename a Git remote
+#[derive(clap::Args, Clone, Debug)]
+pub struct GitRemoteRenameArgs {
+    /// The name of an existing remote
+    old: String,
+    /// The desired name for `old`
+    new: String,
+}
+
+pub fn cmd_git_remote_rename(
+    ui: &mut Ui,
+    command: &CommandHelper,
+    args: &GitRemoteRenameArgs,
+) -> Result<(), CommandError> {
+    let mut workspace_command = command.workspace_helper(ui)?;
+    let repo = workspace_command.repo();
+    let git_repo = get_git_repo(repo.store())?;
+    let mut tx = workspace_command.start_transaction();
+    git::rename_remote(tx.mut_repo(), &git_repo, &args.old, &args.new)?;
+    if tx.mut_repo().has_changes() {
+        tx.finish(
+            ui,
+            format!("rename git remote {} to {}", &args.old, &args.new),
+        )
+    } else {
+        Ok(()) // Do not print "Nothing changed."
+    }
+}
diff --git a/cli/src/commands/git/remote/set_url.rs b/cli/src/commands/git/remote/set_url.rs
new file mode 100644
index 0000000000..cee2da0559
--- /dev/null
+++ b/cli/src/commands/git/remote/set_url.rs
@@ -0,0 +1,42 @@
+// Copyright 2024 The Jujutsu Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use jj_lib::git;
+use jj_lib::repo::Repo;
+
+use crate::cli_util::CommandHelper;
+use crate::command_error::CommandError;
+use crate::git_util::get_git_repo;
+use crate::ui::Ui;
+
+/// Set the URL of a Git remote
+#[derive(clap::Args, Clone, Debug)]
+pub struct GitRemoteSetUrlArgs {
+    /// The remote's name
+    remote: String,
+    /// The desired url for `remote`
+    url: String,
+}
+
+pub fn cmd_git_remote_set_url(
+    ui: &mut Ui,
+    command: &CommandHelper,
+    args: &GitRemoteSetUrlArgs,
+) -> Result<(), CommandError> {
+    let workspace_command = command.workspace_helper(ui)?;
+    let repo = workspace_command.repo();
+    let git_repo = get_git_repo(repo.store())?;
+    git::set_remote_url(&git_repo, &args.remote, &args.url)?;
+    Ok(())
+}
diff --git a/cli/src/commands/git/submodule.rs b/cli/src/commands/git/submodule.rs
new file mode 100644
index 0000000000..e7185143c5
--- /dev/null
+++ b/cli/src/commands/git/submodule.rs
@@ -0,0 +1,89 @@
+// Copyright 2020-2023 The Jujutsu Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use std::io::Write;
+
+use clap::Subcommand;
+use jj_lib::backend::TreeValue;
+use jj_lib::git::parse_gitmodules;
+use jj_lib::repo::Repo;
+use jj_lib::repo_path::RepoPath;
+
+use crate::cli_util::{CommandHelper, RevisionArg};
+use crate::command_error::{user_error, CommandError};
+use crate::ui::Ui;
+
+/// FOR INTERNAL USE ONLY Interact with git submodules
+#[derive(Subcommand, Clone, Debug)]
+pub enum GitSubmoduleCommand {
+    /// Print the relevant contents from .gitmodules. For debugging purposes
+    /// only.
+    PrintGitmodules(PrintArgs),
+}
+
+pub fn cmd_git_submodule(
+    ui: &mut Ui,
+    command: &CommandHelper,
+    subcommand: &GitSubmoduleCommand,
+) -> Result<(), CommandError> {
+    match subcommand {
+        GitSubmoduleCommand::PrintGitmodules(args) => cmd_submodule_print(ui, command, args),
+    }
+}
+
+// TODO: break everything below into a separate file as soon as there is more
+// than one subcommand here.
+
+/// Print debugging info about Git submodules
+#[derive(clap::Args, Clone, Debug)]
+#[command(hide = true)]
+pub struct PrintArgs {
+    /// Read .gitmodules from the given revision.
+    #[arg(long, short = 'r', default_value = "@")]
+    revisions: RevisionArg,
+}
+
+fn cmd_submodule_print(
+    ui: &mut Ui,
+    command: &CommandHelper,
+    args: &PrintArgs,
+) -> Result<(), CommandError> {
+    let workspace_command = command.workspace_helper(ui)?;
+    let repo = workspace_command.repo();
+    let commit = workspace_command.resolve_single_rev(&args.revisions)?;
+    let tree = commit.tree()?;
+    let gitmodules_path = RepoPath::from_internal_string(".gitmodules");
+    let mut gitmodules_file = match tree.path_value(gitmodules_path)?.into_resolved() {
+        Ok(None) => {
+            writeln!(ui.status(), "No submodules!")?;
+            return Ok(());
+        }
+        Ok(Some(TreeValue::File { id, .. })) => repo.store().read_file(gitmodules_path, &id)?,
+        _ => {
+            return Err(user_error(".gitmodules is not a file."));
+        }
+    };
+
+    let submodules = parse_gitmodules(&mut gitmodules_file)?;
+    for (name, submodule) in submodules {
+        writeln!(
+            ui.stdout(),
+            "name:{}\nurl:{}\npath:{}\n\n",
+            name,
+            submodule.url,
+            submodule.path
+        )?;
+    }
+    Ok(())
+}
diff --git a/cli/src/commands/init.rs b/cli/src/commands/init.rs
index 0e6d952dcb..1ec74ed479 100644
--- a/cli/src/commands/init.rs
+++ b/cli/src/commands/init.rs
@@ -60,12 +60,12 @@ pub(crate) fn cmd_init(
     // a colocated repo.
     let colocate = false;
     if args.git || args.git_repo.is_some() {
-        git::git_init(ui, command, &wc_path, colocate, args.git_repo.as_deref())?;
+        git::init::do_init(ui, command, &wc_path, colocate, args.git_repo.as_deref())?;
         writeln!(
             ui.warning_default(),
             "`--git` and `--git-repo` are deprecated.
 Use `jj git init` instead"
-        )?;
+        )?
     } else {
         if !command.settings().allow_native_backend() {
             return Err(user_error_with_hint(
diff --git a/cli/src/commands/log.rs b/cli/src/commands/log.rs
index d1afd286db..46fbcb1644 100644
--- a/cli/src/commands/log.rs
+++ b/cli/src/commands/log.rs
@@ -49,8 +49,16 @@ pub(crate) struct LogArgs {
     /// Limit number of revisions to show
     ///
     /// Applied after revisions are filtered and reordered.
-    #[arg(long, short)]
+    #[arg(long, short = 'n')]
     limit: Option<usize>,
+    // TODO: Delete `-l` alias in jj 0.25+
+    #[arg(
+        short = 'l',
+        hide = true,
+        conflicts_with = "limit",
+        value_name = "LIMIT"
+    )]
+    deprecated_limit: Option<usize>,
     /// Don't show the graph, show a flat list of revisions
     #[arg(long)]
     no_graph: bool,
@@ -137,6 +145,14 @@ pub(crate) fn cmd_log(
         let mut formatter = ui.stdout_formatter();
         let formatter = formatter.as_mut();
 
+        if args.deprecated_limit.is_some() {
+            writeln!(
+                ui.warning_default(),
+                "The -l shorthand is deprecated, use -n instead."
+            )?;
+        }
+        let limit = args.limit.or(args.deprecated_limit).unwrap_or(usize::MAX);
+
         if !args.no_graph {
             let mut graph = get_graphlog(command.settings(), formatter.raw());
             let forward_iter = TopoGroupedGraphIterator::new(revset.iter_graph());
@@ -145,7 +161,7 @@ pub(crate) fn cmd_log(
             } else {
                 Box::new(forward_iter)
             };
-            for (commit_id, edges) in iter.take(args.limit.unwrap_or(usize::MAX)) {
+            for (commit_id, edges) in iter.take(limit) {
                 // The graph is keyed by (CommitId, is_synthetic)
                 let mut graphlog_edges = vec![];
                 // TODO: Should we update revset.iter_graph() to yield this flag instead of all
@@ -222,7 +238,7 @@ pub(crate) fn cmd_log(
             } else {
                 Box::new(revset.iter())
             };
-            for commit_or_error in iter.commits(store).take(args.limit.unwrap_or(usize::MAX)) {
+            for commit_or_error in iter.commits(store).take(limit) {
                 let commit = commit_or_error?;
                 with_content_format
                     .write(formatter, |formatter| template.format(&commit, formatter))?;
diff --git a/cli/src/commands/mod.rs b/cli/src/commands/mod.rs
index 188147ad59..4498ed398c 100644
--- a/cli/src/commands/mod.rs
+++ b/cli/src/commands/mod.rs
@@ -17,9 +17,7 @@ mod backout;
 #[cfg(feature = "bench")]
 mod bench;
 mod branch;
-mod cat;
 mod checkout;
-mod chmod;
 mod commit;
 mod config;
 mod debug;
@@ -28,7 +26,7 @@ mod diff;
 mod diffedit;
 mod duplicate;
 mod edit;
-mod files;
+mod file;
 mod fix;
 mod git;
 mod init;
@@ -77,11 +75,12 @@ enum Command {
     Bench(bench::BenchCommand),
     #[command(subcommand)]
     Branch(branch::BranchCommand),
-    #[command(alias = "print")]
-    Cat(cat::CatArgs),
+    #[command(alias = "print", hide = true)]
+    Cat(file::show::FileShowArgs),
     #[command(hide = true)]
     Checkout(checkout::CheckoutArgs),
-    Chmod(chmod::ChmodArgs),
+    #[command(hide = true)]
+    Chmod(file::chmod::FileChmodArgs),
     Commit(commit::CommitArgs),
     #[command(subcommand)]
     Config(config::ConfigCommand),
@@ -92,7 +91,11 @@ enum Command {
     Diffedit(diffedit::DiffeditArgs),
     Duplicate(duplicate::DuplicateArgs),
     Edit(edit::EditArgs),
-    Files(files::FilesArgs),
+    #[command(subcommand)]
+    File(file::FileCommand),
+    /// List files in a revision (DEPRECATED use `jj file list`)
+    #[command(hide = true)]
+    Files(file::list::FileListArgs),
     Fix(fix::FixArgs),
     #[command(subcommand)]
     Git(git::GitCommand),
@@ -134,7 +137,7 @@ enum Command {
     Run(run::RunArgs),
     Show(show::ShowArgs),
     #[command(subcommand)]
-    Sparse(sparse::SparseArgs),
+    Sparse(sparse::SparseCommand),
     Split(split::SplitArgs),
     Squash(squash::SquashArgs),
     Status(status::StatusArgs),
@@ -143,7 +146,7 @@ enum Command {
     #[command(subcommand)]
     Util(util::UtilCommand),
     /// Undo an operation (shortcut for `jj op undo`)
-    Undo(operation::OperationUndoArgs),
+    Undo(operation::undo::OperationUndoArgs),
     Unsquash(unsquash::UnsquashArgs),
     Untrack(untrack::UntrackArgs),
     Version(version::VersionArgs),
@@ -164,58 +167,57 @@ pub fn default_app() -> clap::Command {
 
 #[instrument(skip_all)]
 pub fn run_command(ui: &mut Ui, command_helper: &CommandHelper) -> Result<(), CommandError> {
-    let derived_subcommands: Command = Command::from_arg_matches(command_helper.matches()).unwrap();
-    match &derived_subcommands {
-        Command::Version(sub_args) => version::cmd_version(ui, command_helper, sub_args),
-        Command::Init(sub_args) => init::cmd_init(ui, command_helper, sub_args),
-        Command::Config(sub_args) => config::cmd_config(ui, command_helper, sub_args),
-        Command::Checkout(sub_args) => checkout::cmd_checkout(ui, command_helper, sub_args),
-        Command::Untrack(sub_args) => untrack::cmd_untrack(ui, command_helper, sub_args),
-        Command::Files(sub_args) => files::cmd_files(ui, command_helper, sub_args),
-        Command::Cat(sub_args) => cat::cmd_cat(ui, command_helper, sub_args),
-        Command::Diff(sub_args) => diff::cmd_diff(ui, command_helper, sub_args),
-        Command::Show(sub_args) => show::cmd_show(ui, command_helper, sub_args),
-        Command::Status(sub_args) => status::cmd_status(ui, command_helper, sub_args),
-        Command::Log(sub_args) => log::cmd_log(ui, command_helper, sub_args),
-        Command::Interdiff(sub_args) => interdiff::cmd_interdiff(ui, command_helper, sub_args),
-        Command::Obslog(sub_args) => obslog::cmd_obslog(ui, command_helper, sub_args),
-        Command::Describe(sub_args) => describe::cmd_describe(ui, command_helper, sub_args),
-        Command::Commit(sub_args) => commit::cmd_commit(ui, command_helper, sub_args),
-        Command::Duplicate(sub_args) => duplicate::cmd_duplicate(ui, command_helper, sub_args),
-        Command::Abandon(sub_args) => abandon::cmd_abandon(ui, command_helper, sub_args),
-        Command::Edit(sub_args) => edit::cmd_edit(ui, command_helper, sub_args),
-        Command::Next(sub_args) => next::cmd_next(ui, command_helper, sub_args),
-        Command::Parallelize(sub_args) => {
-            parallelize::cmd_parallelize(ui, command_helper, sub_args)
-        }
-        Command::Prev(sub_args) => prev::cmd_prev(ui, command_helper, sub_args),
-        Command::New(sub_args) => new::cmd_new(ui, command_helper, sub_args),
-        Command::Move(sub_args) => r#move::cmd_move(ui, command_helper, sub_args),
-        Command::Squash(sub_args) => squash::cmd_squash(ui, command_helper, sub_args),
-        Command::Unsquash(sub_args) => unsquash::cmd_unsquash(ui, command_helper, sub_args),
-        Command::Restore(sub_args) => restore::cmd_restore(ui, command_helper, sub_args),
-        Command::Revert(_args) => revert(),
-        Command::Root(sub_args) => root::cmd_root(ui, command_helper, sub_args),
-        Command::Run(sub_args) => run::cmd_run(ui, command_helper, sub_args),
-        Command::Diffedit(sub_args) => diffedit::cmd_diffedit(ui, command_helper, sub_args),
-        Command::Split(sub_args) => split::cmd_split(ui, command_helper, sub_args),
-        Command::Merge(sub_args) => merge::cmd_merge(ui, command_helper, sub_args),
-        Command::Rebase(sub_args) => rebase::cmd_rebase(ui, command_helper, sub_args),
-        Command::Backout(sub_args) => backout::cmd_backout(ui, command_helper, sub_args),
-        Command::Fix(sub_args) => fix::cmd_fix(ui, command_helper, sub_args),
-        Command::Resolve(sub_args) => resolve::cmd_resolve(ui, command_helper, sub_args),
-        Command::Branch(sub_args) => branch::cmd_branch(ui, command_helper, sub_args),
-        Command::Undo(sub_args) => operation::cmd_op_undo(ui, command_helper, sub_args),
-        Command::Operation(sub_args) => operation::cmd_operation(ui, command_helper, sub_args),
-        Command::Workspace(sub_args) => workspace::cmd_workspace(ui, command_helper, sub_args),
-        Command::Sparse(sub_args) => sparse::cmd_sparse(ui, command_helper, sub_args),
-        Command::Tag(sub_args) => tag::cmd_tag(ui, command_helper, sub_args),
-        Command::Chmod(sub_args) => chmod::cmd_chmod(ui, command_helper, sub_args),
-        Command::Git(sub_args) => git::cmd_git(ui, command_helper, sub_args),
-        Command::Util(sub_args) => util::cmd_util(ui, command_helper, sub_args),
+    let subcommand = Command::from_arg_matches(command_helper.matches()).unwrap();
+    match &subcommand {
+        Command::Abandon(args) => abandon::cmd_abandon(ui, command_helper, args),
+        Command::Backout(args) => backout::cmd_backout(ui, command_helper, args),
         #[cfg(feature = "bench")]
-        Command::Bench(sub_args) => bench::cmd_bench(ui, command_helper, sub_args),
-        Command::Debug(sub_args) => debug::cmd_debug(ui, command_helper, sub_args),
+        Command::Bench(args) => bench::cmd_bench(ui, command_helper, args),
+        Command::Branch(args) => branch::cmd_branch(ui, command_helper, args),
+        Command::Cat(args) => file::show::deprecated_cmd_cat(ui, command_helper, args),
+        Command::Checkout(args) => checkout::cmd_checkout(ui, command_helper, args),
+        Command::Chmod(args) => file::chmod::deprecated_cmd_chmod(ui, command_helper, args),
+        Command::Commit(args) => commit::cmd_commit(ui, command_helper, args),
+        Command::Config(args) => config::cmd_config(ui, command_helper, args),
+        Command::Debug(args) => debug::cmd_debug(ui, command_helper, args),
+        Command::Describe(args) => describe::cmd_describe(ui, command_helper, args),
+        Command::Diff(args) => diff::cmd_diff(ui, command_helper, args),
+        Command::Diffedit(args) => diffedit::cmd_diffedit(ui, command_helper, args),
+        Command::Duplicate(args) => duplicate::cmd_duplicate(ui, command_helper, args),
+        Command::Edit(args) => edit::cmd_edit(ui, command_helper, args),
+        Command::File(args) => file::cmd_file(ui, command_helper, args),
+        Command::Files(args) => file::list::deprecated_cmd_files(ui, command_helper, args),
+        Command::Fix(args) => fix::cmd_fix(ui, command_helper, args),
+        Command::Git(args) => git::cmd_git(ui, command_helper, args),
+        Command::Init(args) => init::cmd_init(ui, command_helper, args),
+        Command::Interdiff(args) => interdiff::cmd_interdiff(ui, command_helper, args),
+        Command::Log(args) => log::cmd_log(ui, command_helper, args),
+        Command::Merge(args) => merge::cmd_merge(ui, command_helper, args),
+        Command::Move(args) => r#move::cmd_move(ui, command_helper, args),
+        Command::New(args) => new::cmd_new(ui, command_helper, args),
+        Command::Next(args) => next::cmd_next(ui, command_helper, args),
+        Command::Obslog(args) => obslog::cmd_obslog(ui, command_helper, args),
+        Command::Operation(args) => operation::cmd_operation(ui, command_helper, args),
+        Command::Parallelize(args) => parallelize::cmd_parallelize(ui, command_helper, args),
+        Command::Prev(args) => prev::cmd_prev(ui, command_helper, args),
+        Command::Rebase(args) => rebase::cmd_rebase(ui, command_helper, args),
+        Command::Resolve(args) => resolve::cmd_resolve(ui, command_helper, args),
+        Command::Restore(args) => restore::cmd_restore(ui, command_helper, args),
+        Command::Revert(_args) => revert(),
+        Command::Root(args) => root::cmd_root(ui, command_helper, args),
+        Command::Run(args) => run::cmd_run(ui, command_helper, args),
+        Command::Show(args) => show::cmd_show(ui, command_helper, args),
+        Command::Sparse(args) => sparse::cmd_sparse(ui, command_helper, args),
+        Command::Split(args) => split::cmd_split(ui, command_helper, args),
+        Command::Squash(args) => squash::cmd_squash(ui, command_helper, args),
+        Command::Status(args) => status::cmd_status(ui, command_helper, args),
+        Command::Tag(args) => tag::cmd_tag(ui, command_helper, args),
+        Command::Undo(args) => operation::undo::cmd_op_undo(ui, command_helper, args),
+        Command::Unsquash(args) => unsquash::cmd_unsquash(ui, command_helper, args),
+        Command::Untrack(args) => untrack::cmd_untrack(ui, command_helper, args),
+        Command::Util(args) => util::cmd_util(ui, command_helper, args),
+        Command::Version(args) => version::cmd_version(ui, command_helper, args),
+        Command::Workspace(args) => workspace::cmd_workspace(ui, command_helper, args),
     }
 }
 
diff --git a/cli/src/commands/next.rs b/cli/src/commands/next.rs
index 8ae074fdb7..6a78a790b6 100644
--- a/cli/src/commands/next.rs
+++ b/cli/src/commands/next.rs
@@ -17,7 +17,7 @@ use std::io::Write;
 use itertools::Itertools;
 use jj_lib::commit::Commit;
 use jj_lib::repo::Repo;
-use jj_lib::revset::{RevsetExpression, RevsetIteratorExt};
+use jj_lib::revset::{RevsetExpression, RevsetFilterPredicate, RevsetIteratorExt};
 
 use crate::cli_util::{short_commit_hash, CommandHelper, WorkspaceCommandHelper};
 use crate::command_error::{user_error, CommandError};
@@ -65,6 +65,9 @@ pub(crate) struct NextArgs {
     /// edit`).
     #[arg(long, short)]
     edit: bool,
+    /// Jump to the next conflicted descendant.
+    #[arg(long, conflicts_with = "offset")]
+    conflict: bool,
 }
 
 pub fn choose_commit<'a>(
@@ -117,21 +120,29 @@ pub(crate) fn cmd_next(
     let wc_revset = RevsetExpression::commit(current_wc_id.clone());
     // If we're editing, start at the working-copy commit. Otherwise, start from
     // its direct parent(s).
-    let target_revset = if edit {
-        wc_revset.descendants_at(args.offset)
+    let start_revset = if edit {
+        wc_revset.clone()
     } else {
-        wc_revset
-            .parents()
-            .descendants_at(args.offset)
-            // In previous versions we subtracted `wc_revset.descendants()`. That's
-            // unnecessary now that --edit is implied if `@` has descendants.
-            .minus(&wc_revset)
+        wc_revset.parents()
     };
+
+    let target_revset = if args.conflict {
+        start_revset
+            .children()
+            .descendants()
+            .filtered(RevsetFilterPredicate::HasConflict)
+            .roots()
+    } else {
+        start_revset.descendants_at(args.offset)
+    }
+    .minus(&wc_revset);
+
     let targets: Vec<Commit> = target_revset
         .evaluate_programmatic(workspace_command.repo().as_ref())?
         .iter()
         .commits(workspace_command.repo().store())
         .try_collect()?;
+
     let target = match targets.as_slice() {
         [target] => target,
         [] => {
diff --git a/cli/src/commands/obslog.rs b/cli/src/commands/obslog.rs
index d3ce56cd80..7a34c735f1 100644
--- a/cli/src/commands/obslog.rs
+++ b/cli/src/commands/obslog.rs
@@ -39,8 +39,16 @@ pub(crate) struct ObslogArgs {
     #[arg(long, short, default_value = "@")]
     revision: RevisionArg,
     /// Limit number of revisions to show
-    #[arg(long, short)]
+    #[arg(long, short = 'n')]
     limit: Option<usize>,
+    // TODO: Delete `-l` alias in jj 0.25+
+    #[arg(
+        short = 'l',
+        hide = true,
+        conflicts_with = "limit",
+        value_name = "LIMIT"
+    )]
+    deprecated_limit: Option<usize>,
     /// Don't show the graph, show a flat list of revisions
     #[arg(long)]
     no_graph: bool,
@@ -107,7 +115,13 @@ pub(crate) fn cmd_obslog(
         |commit: &Commit| commit.id().clone(),
         |commit: &Commit| commit.predecessors().collect_vec(),
     )?;
-    if let Some(n) = args.limit {
+    if args.deprecated_limit.is_some() {
+        writeln!(
+            ui.warning_default(),
+            "The -l shorthand is deprecated, use -n instead."
+        )?;
+    }
+    if let Some(n) = args.limit.or(args.deprecated_limit) {
         commits.truncate(n);
     }
     if !args.no_graph {
diff --git a/cli/src/commands/operation.rs b/cli/src/commands/operation.rs
deleted file mode 100644
index 782cb85335..0000000000
--- a/cli/src/commands/operation.rs
+++ /dev/null
@@ -1,409 +0,0 @@
-// Copyright 2020-2023 The Jujutsu Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-use std::io::Write as _;
-use std::slice;
-
-use clap::Subcommand;
-use itertools::Itertools as _;
-use jj_lib::object_id::ObjectId;
-use jj_lib::op_store::OperationId;
-use jj_lib::op_walk;
-use jj_lib::operation::Operation;
-use jj_lib::repo::Repo;
-
-use crate::cli_util::{format_template, short_operation_hash, CommandHelper, LogContentFormat};
-use crate::command_error::{user_error, user_error_with_hint, CommandError};
-use crate::graphlog::{get_graphlog, Edge};
-use crate::operation_templater::OperationTemplateLanguage;
-use crate::ui::Ui;
-
-/// Commands for working with the operation log
-///
-/// For information about the operation log, see
-/// https://github.com/martinvonz/jj/blob/main/docs/operation-log.md.
-#[derive(Subcommand, Clone, Debug)]
-pub enum OperationCommand {
-    Abandon(OperationAbandonArgs),
-    Log(OperationLogArgs),
-    Undo(OperationUndoArgs),
-    Restore(OperationRestoreArgs),
-}
-
-/// Show the operation log
-#[derive(clap::Args, Clone, Debug)]
-pub struct OperationLogArgs {
-    /// Limit number of operations to show
-    #[arg(long, short)]
-    limit: Option<usize>,
-    /// Don't show the graph, show a flat list of operations
-    #[arg(long)]
-    no_graph: bool,
-    /// Render each operation using the given template
-    ///
-    /// For the syntax, see https://github.com/martinvonz/jj/blob/main/docs/templates.md
-    #[arg(long, short = 'T')]
-    template: Option<String>,
-}
-
-/// Create a new operation that restores the repo to an earlier state
-///
-/// This restores the repo to the state at the specified operation, effectively
-/// undoing all later operations. It does so by creating a new operation.
-#[derive(clap::Args, Clone, Debug)]
-pub struct OperationRestoreArgs {
-    /// The operation to restore to
-    ///
-    /// Use `jj op log` to find an operation to restore to. Use e.g. `jj
-    /// --at-op=<operation ID> log` before restoring to an operation to see the
-    /// state of the repo at that operation.
-    operation: String,
-
-    /// What portions of the local state to restore (can be repeated)
-    ///
-    /// This option is EXPERIMENTAL.
-    #[arg(long, value_enum, default_values_t = DEFAULT_UNDO_WHAT)]
-    what: Vec<UndoWhatToRestore>,
-}
-
-/// Create a new operation that undoes an earlier operation
-///
-/// This undoes an individual operation by applying the inverse of the
-/// operation.
-#[derive(clap::Args, Clone, Debug)]
-pub struct OperationUndoArgs {
-    /// The operation to undo
-    ///
-    /// Use `jj op log` to find an operation to undo.
-    #[arg(default_value = "@")]
-    operation: String,
-
-    /// What portions of the local state to restore (can be repeated)
-    ///
-    /// This option is EXPERIMENTAL.
-    #[arg(long, value_enum, default_values_t = DEFAULT_UNDO_WHAT)]
-    what: Vec<UndoWhatToRestore>,
-}
-
-/// Abandon operation history
-///
-/// To discard old operation history, use `jj op abandon ..<operation ID>`. It
-/// will abandon the specified operation and all its ancestors. The descendants
-/// will be reparented onto the root operation.
-///
-/// To discard recent operations, use `jj op restore <operation ID>` followed
-/// by `jj op abandon <operation ID>..@-`.
-///
-/// The abandoned operations, commits, and other unreachable objects can later
-/// be garbage collected by using `jj util gc` command.
-#[derive(clap::Args, Clone, Debug)]
-pub struct OperationAbandonArgs {
-    /// The operation or operation range to abandon
-    operation: String,
-}
-
-#[derive(Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord, clap::ValueEnum)]
-enum UndoWhatToRestore {
-    /// The jj repo state and local branches
-    Repo,
-    /// The remote-tracking branches. Do not restore these if you'd like to push
-    /// after the undo
-    RemoteTracking,
-}
-
-const DEFAULT_UNDO_WHAT: [UndoWhatToRestore; 2] =
-    [UndoWhatToRestore::Repo, UndoWhatToRestore::RemoteTracking];
-
-fn cmd_op_log(
-    ui: &mut Ui,
-    command: &CommandHelper,
-    args: &OperationLogArgs,
-) -> Result<(), CommandError> {
-    // Don't load the repo so that the operation history can be inspected even
-    // with a corrupted repo state. For example, you can find the first bad
-    // operation id to be abandoned.
-    let workspace = command.load_workspace()?;
-    let repo_loader = workspace.repo_loader();
-    let head_op_str = &command.global_args().at_operation;
-    let head_ops = if head_op_str == "@" {
-        // If multiple head ops can't be resolved without merging, let the
-        // current op be empty. Beware that resolve_op_for_load() will eliminate
-        // redundant heads whereas get_current_head_ops() won't.
-        let current_op = op_walk::resolve_op_for_load(repo_loader, head_op_str).ok();
-        if let Some(op) = current_op {
-            vec![op]
-        } else {
-            op_walk::get_current_head_ops(
-                repo_loader.op_store(),
-                repo_loader.op_heads_store().as_ref(),
-            )?
-        }
-    } else {
-        vec![op_walk::resolve_op_for_load(repo_loader, head_op_str)?]
-    };
-    let current_op_id = match &*head_ops {
-        [op] => Some(op.id()),
-        _ => None,
-    };
-    let with_content_format = LogContentFormat::new(ui, command.settings())?;
-
-    let template;
-    let op_node_template;
-    {
-        let language = OperationTemplateLanguage::new(
-            repo_loader.op_store().root_operation_id(),
-            current_op_id,
-            command.operation_template_extensions(),
-        );
-        let text = match &args.template {
-            Some(value) => value.to_owned(),
-            None => command.settings().config().get_string("templates.op_log")?,
-        };
-        template = command
-            .parse_template(
-                ui,
-                &language,
-                &text,
-                OperationTemplateLanguage::wrap_operation,
-            )?
-            .labeled("op_log");
-        op_node_template = command
-            .parse_template(
-                ui,
-                &language,
-                &command.settings().op_node_template(),
-                OperationTemplateLanguage::wrap_operation,
-            )?
-            .labeled("node");
-    }
-
-    ui.request_pager();
-    let mut formatter = ui.stdout_formatter();
-    let formatter = formatter.as_mut();
-    let iter = op_walk::walk_ancestors(&head_ops).take(args.limit.unwrap_or(usize::MAX));
-    if !args.no_graph {
-        let mut graph = get_graphlog(command.settings(), formatter.raw());
-        for op in iter {
-            let op = op?;
-            let mut edges = vec![];
-            for id in op.parent_ids() {
-                edges.push(Edge::Direct(id.clone()));
-            }
-            let mut buffer = vec![];
-            with_content_format.write_graph_text(
-                ui.new_formatter(&mut buffer).as_mut(),
-                |formatter| template.format(&op, formatter),
-                || graph.width(op.id(), &edges),
-            )?;
-            if !buffer.ends_with(b"\n") {
-                buffer.push(b'\n');
-            }
-            let node_symbol = format_template(ui, &op, &op_node_template);
-            graph.add_node(
-                op.id(),
-                &edges,
-                &node_symbol,
-                &String::from_utf8_lossy(&buffer),
-            )?;
-        }
-    } else {
-        for op in iter {
-            let op = op?;
-            with_content_format.write(formatter, |formatter| template.format(&op, formatter))?;
-        }
-    }
-
-    Ok(())
-}
-
-/// Restore only the portions of the view specified by the `what` argument
-fn view_with_desired_portions_restored(
-    view_being_restored: &jj_lib::op_store::View,
-    current_view: &jj_lib::op_store::View,
-    what: &[UndoWhatToRestore],
-) -> jj_lib::op_store::View {
-    let repo_source = if what.contains(&UndoWhatToRestore::Repo) {
-        view_being_restored
-    } else {
-        current_view
-    };
-    let remote_source = if what.contains(&UndoWhatToRestore::RemoteTracking) {
-        view_being_restored
-    } else {
-        current_view
-    };
-    jj_lib::op_store::View {
-        head_ids: repo_source.head_ids.clone(),
-        local_branches: repo_source.local_branches.clone(),
-        tags: repo_source.tags.clone(),
-        remote_views: remote_source.remote_views.clone(),
-        git_refs: current_view.git_refs.clone(),
-        git_head: current_view.git_head.clone(),
-        wc_commit_ids: repo_source.wc_commit_ids.clone(),
-    }
-}
-
-pub fn cmd_op_undo(
-    ui: &mut Ui,
-    command: &CommandHelper,
-    args: &OperationUndoArgs,
-) -> Result<(), CommandError> {
-    let mut workspace_command = command.workspace_helper(ui)?;
-    let bad_op = workspace_command.resolve_single_op(&args.operation)?;
-    let mut parent_ops = bad_op.parents();
-    let Some(parent_op) = parent_ops.next().transpose()? else {
-        return Err(user_error("Cannot undo repo initialization"));
-    };
-    if parent_ops.next().is_some() {
-        return Err(user_error("Cannot undo a merge operation"));
-    }
-
-    let mut tx = workspace_command.start_transaction();
-    let repo_loader = tx.base_repo().loader();
-    let bad_repo = repo_loader.load_at(&bad_op)?;
-    let parent_repo = repo_loader.load_at(&parent_op)?;
-    tx.mut_repo().merge(&bad_repo, &parent_repo);
-    let new_view = view_with_desired_portions_restored(
-        tx.repo().view().store_view(),
-        tx.base_repo().view().store_view(),
-        &args.what,
-    );
-    tx.mut_repo().set_view(new_view);
-    tx.finish(ui, format!("undo operation {}", bad_op.id().hex()))?;
-
-    Ok(())
-}
-
-fn cmd_op_restore(
-    ui: &mut Ui,
-    command: &CommandHelper,
-    args: &OperationRestoreArgs,
-) -> Result<(), CommandError> {
-    let mut workspace_command = command.workspace_helper(ui)?;
-    let target_op = workspace_command.resolve_single_op(&args.operation)?;
-    let mut tx = workspace_command.start_transaction();
-    let new_view = view_with_desired_portions_restored(
-        target_op.view()?.store_view(),
-        tx.base_repo().view().store_view(),
-        &args.what,
-    );
-    tx.mut_repo().set_view(new_view);
-    tx.finish(ui, format!("restore to operation {}", target_op.id().hex()))?;
-
-    Ok(())
-}
-
-fn cmd_op_abandon(
-    ui: &mut Ui,
-    command: &CommandHelper,
-    args: &OperationAbandonArgs,
-) -> Result<(), CommandError> {
-    // Don't load the repo so that this command can be used to recover from
-    // corrupted repo state.
-    let mut workspace = command.load_workspace()?;
-    let repo_loader = workspace.repo_loader();
-    let op_store = repo_loader.op_store();
-    // It doesn't make sense to create concurrent operations that will be merged
-    // with the current head.
-    let head_op_str = &command.global_args().at_operation;
-    if head_op_str != "@" {
-        return Err(user_error("--at-op is not respected"));
-    }
-    let current_head_op = op_walk::resolve_op_for_load(repo_loader, head_op_str)?;
-    let resolve_op = |op_str| op_walk::resolve_op_at(op_store, &current_head_op, op_str);
-    let (abandon_root_op, abandon_head_op) =
-        if let Some((root_op_str, head_op_str)) = args.operation.split_once("..") {
-            let root_op = if root_op_str.is_empty() {
-                let id = op_store.root_operation_id();
-                let data = op_store.read_operation(id)?;
-                Operation::new(op_store.clone(), id.clone(), data)
-            } else {
-                resolve_op(root_op_str)?
-            };
-            let head_op = if head_op_str.is_empty() {
-                current_head_op.clone()
-            } else {
-                resolve_op(head_op_str)?
-            };
-            (root_op, head_op)
-        } else {
-            let op = resolve_op(&args.operation)?;
-            let parent_ops: Vec<_> = op.parents().try_collect()?;
-            let parent_op = match parent_ops.len() {
-                0 => return Err(user_error("Cannot abandon the root operation")),
-                1 => parent_ops.into_iter().next().unwrap(),
-                _ => return Err(user_error("Cannot abandon a merge operation")),
-            };
-            (parent_op, op)
-        };
-
-    if abandon_head_op == current_head_op {
-        return Err(user_error_with_hint(
-            "Cannot abandon the current operation",
-            "Run `jj undo` to revert the current operation, then use `jj op abandon`",
-        ));
-    }
-
-    // Reparent descendants, count the number of abandoned operations.
-    let stats = op_walk::reparent_range(
-        op_store.as_ref(),
-        slice::from_ref(&abandon_head_op),
-        slice::from_ref(&current_head_op),
-        &abandon_root_op,
-    )?;
-    let [new_head_id]: [OperationId; 1] = stats.new_head_ids.try_into().unwrap();
-    if current_head_op.id() == &new_head_id {
-        writeln!(ui.status(), "Nothing changed.")?;
-        return Ok(());
-    }
-    writeln!(
-        ui.status(),
-        "Abandoned {} operations and reparented {} descendant operations.",
-        stats.unreachable_count,
-        stats.rewritten_count,
-    )?;
-    repo_loader
-        .op_heads_store()
-        .update_op_heads(slice::from_ref(current_head_op.id()), &new_head_id);
-    // Remap the operation id of the current workspace. If there were any
-    // concurrent operations, user will need to re-abandon their ancestors.
-    if !command.global_args().ignore_working_copy {
-        let mut locked_ws = workspace.start_working_copy_mutation()?;
-        let old_op_id = locked_ws.locked_wc().old_operation_id();
-        if old_op_id != current_head_op.id() {
-            writeln!(
-                ui.warning_default(),
-                "The working copy operation {} is not updated because it differs from the repo {}.",
-                short_operation_hash(old_op_id),
-                short_operation_hash(current_head_op.id()),
-            )?;
-        } else {
-            locked_ws.finish(new_head_id)?
-        }
-    }
-    Ok(())
-}
-
-pub fn cmd_operation(
-    ui: &mut Ui,
-    command: &CommandHelper,
-    subcommand: &OperationCommand,
-) -> Result<(), CommandError> {
-    match subcommand {
-        OperationCommand::Abandon(args) => cmd_op_abandon(ui, command, args),
-        OperationCommand::Log(args) => cmd_op_log(ui, command, args),
-        OperationCommand::Restore(args) => cmd_op_restore(ui, command, args),
-        OperationCommand::Undo(args) => cmd_op_undo(ui, command, args),
-    }
-}
diff --git a/cli/src/commands/operation/abandon.rs b/cli/src/commands/operation/abandon.rs
new file mode 100644
index 0000000000..3d252c45e7
--- /dev/null
+++ b/cli/src/commands/operation/abandon.rs
@@ -0,0 +1,133 @@
+// Copyright 2020-2023 The Jujutsu Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use std::io::Write as _;
+use std::slice;
+
+use itertools::Itertools as _;
+use jj_lib::op_store::OperationId;
+use jj_lib::op_walk;
+use jj_lib::operation::Operation;
+
+use crate::cli_util::{short_operation_hash, CommandHelper};
+use crate::command_error::{user_error, user_error_with_hint, CommandError};
+use crate::ui::Ui;
+
+/// Abandon operation history
+///
+/// To discard old operation history, use `jj op abandon ..<operation ID>`. It
+/// will abandon the specified operation and all its ancestors. The descendants
+/// will be reparented onto the root operation.
+///
+/// To discard recent operations, use `jj op restore <operation ID>` followed
+/// by `jj op abandon <operation ID>..@-`.
+///
+/// The abandoned operations, commits, and other unreachable objects can later
+/// be garbage collected by using `jj util gc` command.
+#[derive(clap::Args, Clone, Debug)]
+pub struct OperationAbandonArgs {
+    /// The operation or operation range to abandon
+    operation: String,
+}
+
+pub fn cmd_op_abandon(
+    ui: &mut Ui,
+    command: &CommandHelper,
+    args: &OperationAbandonArgs,
+) -> Result<(), CommandError> {
+    // Don't load the repo so that this command can be used to recover from
+    // corrupted repo state.
+    let mut workspace = command.load_workspace()?;
+    let repo_loader = workspace.repo_loader();
+    let op_store = repo_loader.op_store();
+    // It doesn't make sense to create concurrent operations that will be merged
+    // with the current head.
+    let head_op_str = &command.global_args().at_operation;
+    if head_op_str != "@" {
+        return Err(user_error("--at-op is not respected"));
+    }
+    let current_head_op = op_walk::resolve_op_for_load(repo_loader, head_op_str)?;
+    let resolve_op = |op_str| op_walk::resolve_op_at(op_store, &current_head_op, op_str);
+    let (abandon_root_op, abandon_head_op) =
+        if let Some((root_op_str, head_op_str)) = args.operation.split_once("..") {
+            let root_op = if root_op_str.is_empty() {
+                let id = op_store.root_operation_id();
+                let data = op_store.read_operation(id)?;
+                Operation::new(op_store.clone(), id.clone(), data)
+            } else {
+                resolve_op(root_op_str)?
+            };
+            let head_op = if head_op_str.is_empty() {
+                current_head_op.clone()
+            } else {
+                resolve_op(head_op_str)?
+            };
+            (root_op, head_op)
+        } else {
+            let op = resolve_op(&args.operation)?;
+            let parent_ops: Vec<_> = op.parents().try_collect()?;
+            let parent_op = match parent_ops.len() {
+                0 => return Err(user_error("Cannot abandon the root operation")),
+                1 => parent_ops.into_iter().next().unwrap(),
+                _ => return Err(user_error("Cannot abandon a merge operation")),
+            };
+            (parent_op, op)
+        };
+
+    if abandon_head_op == current_head_op {
+        return Err(user_error_with_hint(
+            "Cannot abandon the current operation",
+            "Run `jj undo` to revert the current operation, then use `jj op abandon`",
+        ));
+    }
+
+    // Reparent descendants, count the number of abandoned operations.
+    let stats = op_walk::reparent_range(
+        op_store.as_ref(),
+        slice::from_ref(&abandon_head_op),
+        slice::from_ref(&current_head_op),
+        &abandon_root_op,
+    )?;
+    let [new_head_id]: [OperationId; 1] = stats.new_head_ids.try_into().unwrap();
+    if current_head_op.id() == &new_head_id {
+        writeln!(ui.status(), "Nothing changed.")?;
+        return Ok(());
+    }
+    writeln!(
+        ui.status(),
+        "Abandoned {} operations and reparented {} descendant operations.",
+        stats.unreachable_count,
+        stats.rewritten_count,
+    )?;
+    repo_loader
+        .op_heads_store()
+        .update_op_heads(slice::from_ref(current_head_op.id()), &new_head_id);
+    // Remap the operation id of the current workspace. If there were any
+    // concurrent operations, user will need to re-abandon their ancestors.
+    if !command.global_args().ignore_working_copy {
+        let mut locked_ws = workspace.start_working_copy_mutation()?;
+        let old_op_id = locked_ws.locked_wc().old_operation_id();
+        if old_op_id != current_head_op.id() {
+            writeln!(
+                ui.warning_default(),
+                "The working copy operation {} is not updated because it differs from the repo {}.",
+                short_operation_hash(old_op_id),
+                short_operation_hash(current_head_op.id()),
+            )?;
+        } else {
+            locked_ws.finish(new_head_id)?
+        }
+    }
+    Ok(())
+}
diff --git a/cli/src/commands/operation/log.rs b/cli/src/commands/operation/log.rs
new file mode 100644
index 0000000000..d0bc505ff5
--- /dev/null
+++ b/cli/src/commands/operation/log.rs
@@ -0,0 +1,154 @@
+// Copyright 2020-2023 The Jujutsu Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use jj_lib::op_walk;
+
+use crate::cli_util::{format_template, CommandHelper, LogContentFormat};
+use crate::command_error::CommandError;
+use crate::graphlog::{get_graphlog, Edge};
+use crate::operation_templater::OperationTemplateLanguage;
+use crate::ui::Ui;
+
+/// Show the operation log
+#[derive(clap::Args, Clone, Debug)]
+pub struct OperationLogArgs {
+    /// Limit number of operations to show
+    #[arg(long, short = 'n')]
+    limit: Option<usize>,
+    // TODO: Delete `-l` alias in jj 0.25+
+    #[arg(
+        short = 'l',
+        hide = true,
+        conflicts_with = "limit",
+        value_name = "LIMIT"
+    )]
+    deprecated_limit: Option<usize>,
+    /// Don't show the graph, show a flat list of operations
+    #[arg(long)]
+    no_graph: bool,
+    /// Render each operation using the given template
+    ///
+    /// For the syntax, see https://github.com/martinvonz/jj/blob/main/docs/templates.md
+    #[arg(long, short = 'T')]
+    template: Option<String>,
+}
+
+pub fn cmd_op_log(
+    ui: &mut Ui,
+    command: &CommandHelper,
+    args: &OperationLogArgs,
+) -> Result<(), CommandError> {
+    // Don't load the repo so that the operation history can be inspected even
+    // with a corrupted repo state. For example, you can find the first bad
+    // operation id to be abandoned.
+    let workspace = command.load_workspace()?;
+    let repo_loader = workspace.repo_loader();
+    let head_op_str = &command.global_args().at_operation;
+    let head_ops = if head_op_str == "@" {
+        // If multiple head ops can't be resolved without merging, let the
+        // current op be empty. Beware that resolve_op_for_load() will eliminate
+        // redundant heads whereas get_current_head_ops() won't.
+        let current_op = op_walk::resolve_op_for_load(repo_loader, head_op_str).ok();
+        if let Some(op) = current_op {
+            vec![op]
+        } else {
+            op_walk::get_current_head_ops(
+                repo_loader.op_store(),
+                repo_loader.op_heads_store().as_ref(),
+            )?
+        }
+    } else {
+        vec![op_walk::resolve_op_for_load(repo_loader, head_op_str)?]
+    };
+    let current_op_id = match &*head_ops {
+        [op] => Some(op.id()),
+        _ => None,
+    };
+    let with_content_format = LogContentFormat::new(ui, command.settings())?;
+
+    let template;
+    let op_node_template;
+    {
+        let language = OperationTemplateLanguage::new(
+            repo_loader.op_store().root_operation_id(),
+            current_op_id,
+            command.operation_template_extensions(),
+        );
+        let text = match &args.template {
+            Some(value) => value.to_owned(),
+            None => command.settings().config().get_string("templates.op_log")?,
+        };
+        template = command
+            .parse_template(
+                ui,
+                &language,
+                &text,
+                OperationTemplateLanguage::wrap_operation,
+            )?
+            .labeled("op_log");
+        op_node_template = command
+            .parse_template(
+                ui,
+                &language,
+                &command.settings().op_node_template(),
+                OperationTemplateLanguage::wrap_operation,
+            )?
+            .labeled("node");
+    }
+
+    ui.request_pager();
+    let mut formatter = ui.stdout_formatter();
+    let formatter = formatter.as_mut();
+    if args.deprecated_limit.is_some() {
+        writeln!(
+            ui.warning_default(),
+            "The -l shorthand is deprecated, use -n instead."
+        )?;
+    }
+    let limit = args.limit.or(args.deprecated_limit).unwrap_or(usize::MAX);
+    let iter = op_walk::walk_ancestors(&head_ops).take(limit);
+    if !args.no_graph {
+        let mut graph = get_graphlog(command.settings(), formatter.raw());
+        for op in iter {
+            let op = op?;
+            let mut edges = vec![];
+            for id in op.parent_ids() {
+                edges.push(Edge::Direct(id.clone()));
+            }
+            let mut buffer = vec![];
+            with_content_format.write_graph_text(
+                ui.new_formatter(&mut buffer).as_mut(),
+                |formatter| template.format(&op, formatter),
+                || graph.width(op.id(), &edges),
+            )?;
+            if !buffer.ends_with(b"\n") {
+                buffer.push(b'\n');
+            }
+            let node_symbol = format_template(ui, &op, &op_node_template);
+            graph.add_node(
+                op.id(),
+                &edges,
+                &node_symbol,
+                &String::from_utf8_lossy(&buffer),
+            )?;
+        }
+    } else {
+        for op in iter {
+            let op = op?;
+            with_content_format.write(formatter, |formatter| template.format(&op, formatter))?;
+        }
+    }
+
+    Ok(())
+}
diff --git a/cli/src/commands/operation/mod.rs b/cli/src/commands/operation/mod.rs
new file mode 100644
index 0000000000..f28b404df8
--- /dev/null
+++ b/cli/src/commands/operation/mod.rs
@@ -0,0 +1,92 @@
+// Copyright 2020-2023 The Jujutsu Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+mod abandon;
+mod log;
+mod restore;
+pub mod undo;
+
+use abandon::{cmd_op_abandon, OperationAbandonArgs};
+use clap::Subcommand;
+use log::{cmd_op_log, OperationLogArgs};
+use restore::{cmd_op_restore, OperationRestoreArgs};
+use undo::{cmd_op_undo, OperationUndoArgs};
+
+use crate::cli_util::CommandHelper;
+use crate::command_error::CommandError;
+use crate::ui::Ui;
+
+/// Commands for working with the operation log
+///
+/// For information about the operation log, see
+/// https://github.com/martinvonz/jj/blob/main/docs/operation-log.md.
+#[derive(Subcommand, Clone, Debug)]
+pub enum OperationCommand {
+    Abandon(OperationAbandonArgs),
+    Log(OperationLogArgs),
+    Restore(OperationRestoreArgs),
+    Undo(OperationUndoArgs),
+}
+
+pub fn cmd_operation(
+    ui: &mut Ui,
+    command: &CommandHelper,
+    subcommand: &OperationCommand,
+) -> Result<(), CommandError> {
+    match subcommand {
+        OperationCommand::Abandon(args) => cmd_op_abandon(ui, command, args),
+        OperationCommand::Log(args) => cmd_op_log(ui, command, args),
+        OperationCommand::Restore(args) => cmd_op_restore(ui, command, args),
+        OperationCommand::Undo(args) => cmd_op_undo(ui, command, args),
+    }
+}
+
+#[derive(Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord, clap::ValueEnum)]
+enum UndoWhatToRestore {
+    /// The jj repo state and local branches
+    Repo,
+    /// The remote-tracking branches. Do not restore these if you'd like to push
+    /// after the undo
+    RemoteTracking,
+}
+
+const DEFAULT_UNDO_WHAT: [UndoWhatToRestore; 2] =
+    [UndoWhatToRestore::Repo, UndoWhatToRestore::RemoteTracking];
+
+/// Restore only the portions of the view specified by the `what` argument
+fn view_with_desired_portions_restored(
+    view_being_restored: &jj_lib::op_store::View,
+    current_view: &jj_lib::op_store::View,
+    what: &[UndoWhatToRestore],
+) -> jj_lib::op_store::View {
+    let repo_source = if what.contains(&UndoWhatToRestore::Repo) {
+        view_being_restored
+    } else {
+        current_view
+    };
+    let remote_source = if what.contains(&UndoWhatToRestore::RemoteTracking) {
+        view_being_restored
+    } else {
+        current_view
+    };
+    jj_lib::op_store::View {
+        head_ids: repo_source.head_ids.clone(),
+        local_branches: repo_source.local_branches.clone(),
+        tags: repo_source.tags.clone(),
+        remote_views: remote_source.remote_views.clone(),
+        git_refs: current_view.git_refs.clone(),
+        git_head: current_view.git_head.clone(),
+        wc_commit_ids: repo_source.wc_commit_ids.clone(),
+    }
+}
diff --git a/cli/src/commands/operation/restore.rs b/cli/src/commands/operation/restore.rs
new file mode 100644
index 0000000000..a9c9dc2695
--- /dev/null
+++ b/cli/src/commands/operation/restore.rs
@@ -0,0 +1,59 @@
+// Copyright 2020-2023 The Jujutsu Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use jj_lib::object_id::ObjectId;
+
+use super::{view_with_desired_portions_restored, UndoWhatToRestore, DEFAULT_UNDO_WHAT};
+use crate::cli_util::CommandHelper;
+use crate::command_error::CommandError;
+use crate::ui::Ui;
+
+/// Create a new operation that restores the repo to an earlier state
+///
+/// This restores the repo to the state at the specified operation, effectively
+/// undoing all later operations. It does so by creating a new operation.
+#[derive(clap::Args, Clone, Debug)]
+pub struct OperationRestoreArgs {
+    /// The operation to restore to
+    ///
+    /// Use `jj op log` to find an operation to restore to. Use e.g. `jj
+    /// --at-op=<operation ID> log` before restoring to an operation to see the
+    /// state of the repo at that operation.
+    operation: String,
+
+    /// What portions of the local state to restore (can be repeated)
+    ///
+    /// This option is EXPERIMENTAL.
+    #[arg(long, value_enum, default_values_t = DEFAULT_UNDO_WHAT)]
+    what: Vec<UndoWhatToRestore>,
+}
+
+pub fn cmd_op_restore(
+    ui: &mut Ui,
+    command: &CommandHelper,
+    args: &OperationRestoreArgs,
+) -> Result<(), CommandError> {
+    let mut workspace_command = command.workspace_helper(ui)?;
+    let target_op = workspace_command.resolve_single_op(&args.operation)?;
+    let mut tx = workspace_command.start_transaction();
+    let new_view = view_with_desired_portions_restored(
+        target_op.view()?.store_view(),
+        tx.base_repo().view().store_view(),
+        &args.what,
+    );
+    tx.mut_repo().set_view(new_view);
+    tx.finish(ui, format!("restore to operation {}", target_op.id().hex()))?;
+
+    Ok(())
+}
diff --git a/cli/src/commands/operation/undo.rs b/cli/src/commands/operation/undo.rs
new file mode 100644
index 0000000000..2468ce62f2
--- /dev/null
+++ b/cli/src/commands/operation/undo.rs
@@ -0,0 +1,71 @@
+// Copyright 2020-2023 The Jujutsu Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use jj_lib::object_id::ObjectId;
+use jj_lib::repo::Repo;
+
+use super::{view_with_desired_portions_restored, UndoWhatToRestore, DEFAULT_UNDO_WHAT};
+use crate::cli_util::CommandHelper;
+use crate::command_error::{user_error, CommandError};
+use crate::ui::Ui;
+
+/// Create a new operation that undoes an earlier operation
+///
+/// This undoes an individual operation by applying the inverse of the
+/// operation.
+#[derive(clap::Args, Clone, Debug)]
+pub struct OperationUndoArgs {
+    /// The operation to undo
+    ///
+    /// Use `jj op log` to find an operation to undo.
+    #[arg(default_value = "@")]
+    operation: String,
+
+    /// What portions of the local state to restore (can be repeated)
+    ///
+    /// This option is EXPERIMENTAL.
+    #[arg(long, value_enum, default_values_t = DEFAULT_UNDO_WHAT)]
+    what: Vec<UndoWhatToRestore>,
+}
+
+pub fn cmd_op_undo(
+    ui: &mut Ui,
+    command: &CommandHelper,
+    args: &OperationUndoArgs,
+) -> Result<(), CommandError> {
+    let mut workspace_command = command.workspace_helper(ui)?;
+    let bad_op = workspace_command.resolve_single_op(&args.operation)?;
+    let mut parent_ops = bad_op.parents();
+    let Some(parent_op) = parent_ops.next().transpose()? else {
+        return Err(user_error("Cannot undo repo initialization"));
+    };
+    if parent_ops.next().is_some() {
+        return Err(user_error("Cannot undo a merge operation"));
+    }
+
+    let mut tx = workspace_command.start_transaction();
+    let repo_loader = tx.base_repo().loader();
+    let bad_repo = repo_loader.load_at(&bad_op)?;
+    let parent_repo = repo_loader.load_at(&parent_op)?;
+    tx.mut_repo().merge(&bad_repo, &parent_repo);
+    let new_view = view_with_desired_portions_restored(
+        tx.repo().view().store_view(),
+        tx.base_repo().view().store_view(),
+        &args.what,
+    );
+    tx.mut_repo().set_view(new_view);
+    tx.finish(ui, format!("undo operation {}", bad_op.id().hex()))?;
+
+    Ok(())
+}
diff --git a/cli/src/commands/prev.rs b/cli/src/commands/prev.rs
index acd0c100ed..659f116e6c 100644
--- a/cli/src/commands/prev.rs
+++ b/cli/src/commands/prev.rs
@@ -14,7 +14,7 @@
 
 use itertools::Itertools;
 use jj_lib::repo::Repo;
-use jj_lib::revset::{RevsetExpression, RevsetIteratorExt};
+use jj_lib::revset::{RevsetExpression, RevsetFilterPredicate, RevsetIteratorExt};
 
 use crate::cli_util::{short_commit_hash, CommandHelper};
 use crate::command_error::{user_error, CommandError};
@@ -59,6 +59,9 @@ pub(crate) struct PrevArgs {
     /// Edit the parent directly, instead of moving the working-copy commit.
     #[arg(long, short)]
     edit: bool,
+    /// Jump to the previous conflicted ancestor.
+    #[arg(long, conflicts_with = "offset")]
+    conflict: bool,
 }
 
 pub(crate) fn cmd_prev(
@@ -76,14 +79,25 @@ pub(crate) fn cmd_prev(
             .view()
             .heads()
             .contains(current_wc_id);
+    let wc_revset = RevsetExpression::commit(current_wc_id.clone());
     // If we're editing, start at the working-copy commit. Otherwise, start from
     // its direct parent(s).
-    let target_revset = if edit {
-        RevsetExpression::commit(current_wc_id.clone()).ancestors_at(args.offset)
+    let start_revset = if edit {
+        wc_revset.clone()
     } else {
-        RevsetExpression::commit(current_wc_id.clone())
+        wc_revset.parents()
+    };
+
+    let target_revset = if args.conflict {
+        // If people desire to move to the root conflict, replace the `heads()` below
+        // with `roots(). But let's wait for feedback.
+        start_revset
             .parents()
-            .ancestors_at(args.offset)
+            .ancestors()
+            .filtered(RevsetFilterPredicate::HasConflict)
+            .heads()
+    } else {
+        start_revset.ancestors_at(args.offset)
     };
     let targets: Vec<_> = target_revset
         .evaluate_programmatic(workspace_command.repo().as_ref())?
diff --git a/cli/src/commands/sparse.rs b/cli/src/commands/sparse.rs
index 9b4b79b186..4e04f439de 100644
--- a/cli/src/commands/sparse.rs
+++ b/cli/src/commands/sparse.rs
@@ -34,11 +34,11 @@ use crate::ui::Ui;
 /// Manage which paths from the working-copy commit are present in the working
 /// copy
 #[derive(Subcommand, Clone, Debug)]
-pub(crate) enum SparseArgs {
+pub(crate) enum SparseCommand {
+    Edit(SparseEditArgs),
     List(SparseListArgs),
-    Set(SparseSetArgs),
     Reset(SparseResetArgs),
-    Edit(SparseEditArgs),
+    Set(SparseSetArgs),
 }
 
 /// List the patterns that are currently present in the working copy
@@ -88,13 +88,13 @@ pub(crate) struct SparseEditArgs {}
 pub(crate) fn cmd_sparse(
     ui: &mut Ui,
     command: &CommandHelper,
-    args: &SparseArgs,
+    subcommand: &SparseCommand,
 ) -> Result<(), CommandError> {
-    match args {
-        SparseArgs::List(sub_args) => cmd_sparse_list(ui, command, sub_args),
-        SparseArgs::Set(sub_args) => cmd_sparse_set(ui, command, sub_args),
-        SparseArgs::Reset(sub_args) => cmd_sparse_reset(ui, command, sub_args),
-        SparseArgs::Edit(sub_args) => cmd_sparse_edit(ui, command, sub_args),
+    match subcommand {
+        SparseCommand::Edit(args) => cmd_sparse_edit(ui, command, args),
+        SparseCommand::List(args) => cmd_sparse_list(ui, command, args),
+        SparseCommand::Reset(args) => cmd_sparse_reset(ui, command, args),
+        SparseCommand::Set(args) => cmd_sparse_set(ui, command, args),
     }
 }
 
diff --git a/cli/src/commands/split.rs b/cli/src/commands/split.rs
index eecd1837e6..384193de74 100644
--- a/cli/src/commands/split.rs
+++ b/cli/src/commands/split.rs
@@ -51,9 +51,11 @@ pub(crate) struct SplitArgs {
     /// The revision to split
     #[arg(long, short, default_value = "@")]
     revision: RevisionArg,
-    /// Split the revision into two siblings instead of a parent and child.
-    #[arg(long, short)]
-    siblings: bool,
+    /// Split the revision into two parallel revisions instead of a parent and
+    /// child.
+    // TODO: Delete `--siblings` alias in jj 0.25+
+    #[arg(long, short, alias = "siblings")]
+    parallel: bool,
     /// Put these paths in the first commit
     #[arg(value_hint = clap::ValueHint::AnyPath)]
     paths: Vec<String>,
@@ -138,7 +140,7 @@ the operation will be aborted.
 
     // Create the second commit, which includes everything the user didn't
     // select.
-    let (second_tree, second_base_tree) = if args.siblings {
+    let (second_tree, second_base_tree) = if args.parallel {
         // Merge the original commit tree with its parent using the tree
         // containing the user selected changes as the base for the merge.
         // This results in a tree with the changes the user didn't select.
@@ -146,7 +148,7 @@ the operation will be aborted.
     } else {
         (end_tree, &selected_tree)
     };
-    let second_commit_parents = if args.siblings {
+    let second_commit_parents = if args.parallel {
         commit.parent_ids().to_vec()
     } else {
         vec![first_commit.id().clone()]
@@ -190,11 +192,11 @@ the operation will be aborted.
         vec![commit.id().clone()],
         |mut rewriter| {
             num_rebased += 1;
-            if args.siblings {
+            if args.parallel {
                 rewriter
                     .replace_parent(second_commit.id(), [first_commit.id(), second_commit.id()]);
             }
-            // We don't need to do anything special for the non-siblings case
+            // We don't need to do anything special for the non-parallel case
             // since we already marked the original commit as rewritten.
             rewriter.rebase(command.settings())?.write()?;
             Ok(())
diff --git a/cli/src/commands/status.rs b/cli/src/commands/status.rs
index 788cd5b640..7eb3eb4f3d 100644
--- a/cli/src/commands/status.rs
+++ b/cli/src/commands/status.rs
@@ -95,8 +95,10 @@ pub(crate) fn cmd_status(
         // Ancestors with conflicts, excluding the current working copy commit.
         let ancestors_conflicts = workspace_command
             .attach_revset_evaluator(
-                RevsetExpression::filter(RevsetFilterPredicate::HasConflict)
-                    .intersection(&wc_revset.parents().ancestors())
+                wc_revset
+                    .parents()
+                    .ancestors()
+                    .filtered(RevsetFilterPredicate::HasConflict)
                     .minus(&revset_util::parse_immutable_expression(
                         &workspace_command.revset_parse_context(),
                     )?),
diff --git a/cli/src/commands/tag.rs b/cli/src/commands/tag.rs
index c4f6da2dfc..848d2fb1af 100644
--- a/cli/src/commands/tag.rs
+++ b/cli/src/commands/tag.rs
@@ -51,7 +51,7 @@ pub fn cmd_tag(
     subcommand: &TagCommand,
 ) -> Result<(), CommandError> {
     match subcommand {
-        TagCommand::List(sub_args) => cmd_tag_list(ui, command, sub_args),
+        TagCommand::List(args) => cmd_tag_list(ui, command, args),
     }
 }
 
diff --git a/cli/src/commands/untrack.rs b/cli/src/commands/untrack.rs
index 6fbee3f975..449724468f 100644
--- a/cli/src/commands/untrack.rs
+++ b/cli/src/commands/untrack.rs
@@ -69,7 +69,7 @@ pub(crate) fn cmd_untrack(
     // untracked because they're not ignored.
     let wc_tree_id = locked_ws.locked_wc().snapshot(SnapshotOptions {
         base_ignores,
-        fsmonitor_kind: command.settings().fsmonitor_kind()?,
+        fsmonitor_settings: command.settings().fsmonitor_settings()?,
         progress: None,
         max_new_file_size: command.settings().max_new_file_size()?,
     })?;
diff --git a/cli/src/commands/util.rs b/cli/src/commands/util.rs
index 8ddffc8809..54feeb7f84 100644
--- a/cli/src/commands/util.rs
+++ b/cli/src/commands/util.rs
@@ -134,9 +134,10 @@ fn cmd_util_completion(
             "`jj util completion --{shell}` will be removed in a future version, and this will be \
              a hard error"
         )?;
-        if let Some(mut writer) = ui.hint_default() {
-            writeln!(writer, "Use `jj util completion {shell}` instead")?;
-        }
+        writeln!(
+            ui.hint_default(),
+            "Use `jj util completion {shell}` instead"
+        )?;
         Ok(())
     };
     let shell = match (args.shell, args.fish, args.zsh, args.bash) {
diff --git a/cli/src/config-schema.json b/cli/src/config-schema.json
index 25934f95de..5fb08e129f 100644
--- a/cli/src/config-schema.json
+++ b/cli/src/config-schema.json
@@ -168,6 +168,16 @@
                     "type": "string",
                     "enum": ["none", "watchman"],
                     "description": "Whether to use an external filesystem monitor, useful for large repos"
+                },
+                "watchman": {
+                    "type": "object",
+                    "properties": {
+                      "register_snapshot_trigger": {
+                        "type": "boolean",
+                        "default": false,
+                        "description": "Whether to use triggers to monitor for changes in the background."
+                      }
+                    }
                 }
             }
         },
diff --git a/cli/src/config/colors.toml b/cli/src/config/colors.toml
index 286f7fad4b..4a165e3c20 100644
--- a/cli/src/config/colors.toml
+++ b/cli/src/config/colors.toml
@@ -78,8 +78,9 @@
 "diff binary" = "cyan"
 "diff file_header" = { bold = true }
 "diff hunk_header" = "cyan"
-"diff removed" = "red"
-"diff added" = "green"
+"diff removed" = { fg = "red" }
+"diff added" = { fg = "green" }
+"diff token" = { underline = true }
 "diff modified" = "cyan"
 "diff access-denied" = { bg = "red" }
 
diff --git a/cli/src/diff_util.rs b/cli/src/diff_util.rs
index 587dc67a63..8ac0c15a85 100644
--- a/cli/src/diff_util.rs
+++ b/cli/src/diff_util.rs
@@ -48,7 +48,7 @@ const DEFAULT_CONTEXT_LINES: usize = 3;
 
 #[derive(clap::Args, Clone, Debug)]
 #[command(next_help_heading = "Diff Formatting Options")]
-#[command(group(clap::ArgGroup::new("short-format").args(&["summary", "stat", "types"])))]
+#[command(group(clap::ArgGroup::new("short-format").args(&["summary", "stat", "types", "name_only"])))]
 #[command(group(clap::ArgGroup::new("long-format").args(&["git", "color_words", "tool"])))]
 pub struct DiffFormatArgs {
     /// For each path, show only whether it was modified, added, or deleted
@@ -66,6 +66,12 @@ pub struct DiffFormatArgs {
     /// Git submodule.
     #[arg(long)]
     pub types: bool,
+    /// For each path, show only its path
+    ///
+    /// Typically useful for shell commands like:
+    ///    `jj diff -r @- --name_only | xargs perl -pi -e's/OLD/NEW/g`
+    #[arg(long)]
+    pub name_only: bool,
     /// Show a Git-format diff
     #[arg(long)]
     pub git: bool,
@@ -85,6 +91,7 @@ pub enum DiffFormat {
     Summary,
     Stat,
     Types,
+    NameOnly,
     Git { context: usize },
     ColorWords { context: usize },
     Tool(Box<ExternalMergeTool>),
@@ -126,6 +133,7 @@ fn diff_formats_from_args(
     let mut formats = [
         (args.summary, DiffFormat::Summary),
         (args.types, DiffFormat::Types),
+        (args.name_only, DiffFormat::NameOnly),
         (
             args.git,
             DiffFormat::Git {
@@ -176,6 +184,7 @@ fn default_diff_format(
     match name.as_ref() {
         "summary" => Ok(DiffFormat::Summary),
         "types" => Ok(DiffFormat::Types),
+        "name-only" => Ok(DiffFormat::NameOnly),
         "git" => Ok(DiffFormat::Git {
             context: num_context_lines.unwrap_or(DEFAULT_CONTEXT_LINES),
         }),
@@ -251,6 +260,10 @@ impl<'a> DiffRenderer<'a> {
                     let tree_diff = from_tree.diff_stream(to_tree, matcher);
                     show_types(formatter, tree_diff, path_converter)?;
                 }
+                DiffFormat::NameOnly => {
+                    let tree_diff = from_tree.diff_stream(to_tree, matcher);
+                    show_names(formatter, tree_diff, path_converter)?;
+                }
                 DiffFormat::Git { context } => {
                     let tree_diff = from_tree.diff_stream(to_tree, matcher);
                     show_git_diff(repo, formatter, *context, tree_diff)?;
@@ -362,21 +375,25 @@ fn show_color_words_diff_line(
     diff_line: &DiffLine,
 ) -> io::Result<()> {
     if diff_line.has_left_content {
-        write!(
-            formatter.labeled("removed"),
-            "{:>4}",
-            diff_line.left_line_number
-        )?;
+        formatter.with_label("removed", |formatter| {
+            write!(
+                formatter.labeled("line_number"),
+                "{:>4}",
+                diff_line.left_line_number
+            )
+        })?;
         write!(formatter, " ")?;
     } else {
         write!(formatter, "     ")?;
     }
     if diff_line.has_right_content {
-        write!(
-            formatter.labeled("added"),
-            "{:>4}",
-            diff_line.right_line_number
-        )?;
+        formatter.with_label("added", |formatter| {
+            write!(
+                formatter.labeled("line_number"),
+                "{:>4}",
+                diff_line.right_line_number
+            )
+        })?;
         write!(formatter, ": ")?;
     } else {
         write!(formatter, "    : ")?;
@@ -390,10 +407,14 @@ fn show_color_words_diff_line(
                 let before = data[0];
                 let after = data[1];
                 if !before.is_empty() {
-                    formatter.with_label("removed", |formatter| formatter.write_all(before))?;
+                    formatter.with_label("removed", |formatter| {
+                        formatter.with_label("token", |formatter| formatter.write_all(before))
+                    })?;
                 }
                 if !after.is_empty() {
-                    formatter.with_label("added", |formatter| formatter.write_all(after))?;
+                    formatter.with_label("added", |formatter| {
+                        formatter.with_label("token", |formatter| formatter.write_all(after))
+                    })?;
                 }
             }
         }
@@ -726,7 +747,7 @@ fn unified_diff_hunks<'content>(
         lines: vec![],
     };
     let mut show_context_after = false;
-    let diff = Diff::for_tokenizer(&[left_content, right_content], &diff::find_line_ranges);
+    let diff = Diff::for_tokenizer(&[left_content, right_content], diff::find_line_ranges);
     for hunk in diff.hunks() {
         match hunk {
             DiffHunk::Matching(content) => {
@@ -1105,3 +1126,17 @@ fn diff_summary_char(value: &MergedTreeValue) -> char {
         }
     }
 }
+
+pub fn show_names(
+    formatter: &mut dyn Formatter,
+    mut tree_diff: TreeDiffStream,
+    path_converter: &RepoPathUiConverter,
+) -> io::Result<()> {
+    async {
+        while let Some((repo_path, _)) = tree_diff.next().await {
+            writeln!(formatter, "{}", path_converter.format_file_path(&repo_path))?;
+        }
+        Ok(())
+    }
+    .block_on()
+}
diff --git a/cli/src/formatter.rs b/cli/src/formatter.rs
index 164e4a201d..2d8b97a54a 100644
--- a/cli/src/formatter.rs
+++ b/cli/src/formatter.rs
@@ -65,6 +65,11 @@ impl<T, S> LabeledWriter<T, S> {
     pub fn new(formatter: T, label: S) -> Self {
         LabeledWriter { formatter, label }
     }
+
+    /// Turns into writer that prints labeled message with the `heading`.
+    pub fn with_heading<H>(self, heading: H) -> HeadingLabeledWriter<T, S, H> {
+        HeadingLabeledWriter::new(self, heading)
+    }
 }
 
 impl<'a, T, S> LabeledWriter<T, S>
@@ -96,9 +101,9 @@ pub struct HeadingLabeledWriter<T, S, H> {
 }
 
 impl<T, S, H> HeadingLabeledWriter<T, S, H> {
-    pub fn new(formatter: T, label: S, heading: H) -> Self {
+    pub fn new(writer: LabeledWriter<T, S>, heading: H) -> Self {
         HeadingLabeledWriter {
-            writer: LabeledWriter::new(formatter, label),
+            writer,
             heading: Some(heading),
         }
     }
@@ -1162,8 +1167,14 @@ mod tests {
         let mut output: Vec<u8> = vec![];
         let mut formatter: Box<dyn Formatter> =
             Box::new(ColorFormatter::for_config(&mut output, &config, false).unwrap());
-        HeadingLabeledWriter::new(formatter.as_mut(), "inner", "Should be noop: ");
-        let mut writer = HeadingLabeledWriter::new(formatter.as_mut(), "inner", "Heading: ");
+        formatter
+            .as_mut()
+            .labeled("inner")
+            .with_heading("Should be noop: ");
+        let mut writer = formatter
+            .as_mut()
+            .labeled("inner")
+            .with_heading("Heading: ");
         write!(writer, "Message").unwrap();
         writeln!(writer, " continues").unwrap();
         drop(formatter);
@@ -1176,7 +1187,10 @@ mod tests {
     fn test_heading_labeled_writer_empty_string() {
         let mut output: Vec<u8> = vec![];
         let mut formatter: Box<dyn Formatter> = Box::new(PlainTextFormatter::new(&mut output));
-        let mut writer = HeadingLabeledWriter::new(formatter.as_mut(), "inner", "Heading: ");
+        let mut writer = formatter
+            .as_mut()
+            .labeled("inner")
+            .with_heading("Heading: ");
         // write_fmt() is called even if the format string is empty. I don't
         // know if that's guaranteed, but let's record the current behavior.
         write!(writer, "").unwrap();
diff --git a/cli/src/git_util.rs b/cli/src/git_util.rs
index 05f4ba6192..6642470cef 100644
--- a/cli/src/git_util.rs
+++ b/cli/src/git_util.rs
@@ -409,14 +409,12 @@ pub fn print_failed_git_export(
             .iter()
             .any(|failed| matches!(failed.reason, FailedRefExportReason::FailedToSet(_)))
         {
-            if let Some(mut writer) = ui.hint_default() {
-                writeln!(
-                    writer,
-                    r#"Git doesn't allow a branch name that looks like a parent directory of
+            writeln!(
+                ui.hint_default(),
+                r#"Git doesn't allow a branch name that looks like a parent directory of
 another (e.g. `foo` and `foo/bar`). Try to rename the branches that failed to
 export or their "parent" branches."#,
-                )?;
-            }
+            )?;
         }
     }
     Ok(())
diff --git a/cli/src/merge_tools/builtin.rs b/cli/src/merge_tools/builtin.rs
index 5d7cd9e0a5..e4c9b424e8 100644
--- a/cli/src/merge_tools/builtin.rs
+++ b/cli/src/merge_tools/builtin.rs
@@ -227,7 +227,7 @@ fn make_diff_sections(
 ) -> Result<Vec<scm_record::Section<'static>>, BuiltinToolError> {
     let diff = Diff::for_tokenizer(
         &[left_contents.as_bytes(), right_contents.as_bytes()],
-        &find_line_ranges,
+        find_line_ranges,
     );
     let mut sections = Vec::new();
     for hunk in diff.hunks() {
@@ -1014,7 +1014,9 @@ mod tests {
             to_file_id(base_tree.path_value(path).unwrap()),
             to_file_id(right_tree.path_value(path).unwrap()),
         ]);
-        let content = extract_as_single_hunk(&merge, store, path).block_on();
+        let content = extract_as_single_hunk(&merge, store, path)
+            .block_on()
+            .unwrap();
         let slices = content.map(|ContentHunk(buf)| buf.as_slice());
         let merge_result = files::merge(&slices);
         let sections = make_merge_sections(merge_result).unwrap();
diff --git a/cli/src/merge_tools/diff_working_copies.rs b/cli/src/merge_tools/diff_working_copies.rs
index 63a4f60c41..d87d4c1cc2 100644
--- a/cli/src/merge_tools/diff_working_copies.rs
+++ b/cli/src/merge_tools/diff_working_copies.rs
@@ -6,7 +6,7 @@ use std::sync::Arc;
 
 use futures::StreamExt;
 use jj_lib::backend::MergedTreeId;
-use jj_lib::fsmonitor::FsmonitorKind;
+use jj_lib::fsmonitor::FsmonitorSettings;
 use jj_lib::gitignore::GitIgnoreFile;
 use jj_lib::local_working_copy::{TreeState, TreeStateError};
 use jj_lib::matchers::Matcher;
@@ -279,7 +279,7 @@ diff editing in mind and be a little inaccurate.
             .unwrap_or(diff_wc.right_tree_state);
         output_tree_state.snapshot(SnapshotOptions {
             base_ignores,
-            fsmonitor_kind: FsmonitorKind::None,
+            fsmonitor_settings: FsmonitorSettings::None,
             progress: None,
             max_new_file_size: u64::MAX,
         })?;
diff --git a/cli/src/merge_tools/mod.rs b/cli/src/merge_tools/mod.rs
index 00dee77ba7..091989e95e 100644
--- a/cli/src/merge_tools/mod.rs
+++ b/cli/src/merge_tools/mod.rs
@@ -120,14 +120,12 @@ fn editor_args_from_settings(
         Ok(args)
     } else {
         let default_editor = BUILTIN_EDITOR_NAME;
-        if let Some(mut writer) = ui.hint_default() {
-            writeln!(
-                writer,
-                "Using default editor '{default_editor}'; run `jj config set --user {key} \
-                 :builtin` to disable this message."
-            )
-            .ok();
-        }
+        writeln!(
+            ui.hint_default(),
+            "Using default editor '{default_editor}'; run `jj config set --user {key} :builtin` \
+             to disable this message."
+        )
+        .ok();
         Ok(default_editor.into())
     }
 }
@@ -298,14 +296,16 @@ impl MergeEditor {
                 String::from_utf8_lossy(summary_bytes.as_slice()).to_string(),
             )
         })?;
+        let simplified_file_merge = file_merge.clone().simplify();
         // We only support conflicts with 2 sides (3-way conflicts)
-        if file_merge.num_sides() > 2 {
+        if simplified_file_merge.num_sides() > 2 {
             return Err(ConflictResolveError::ConflictTooComplicated {
                 path: repo_path.to_owned(),
-                sides: file_merge.num_sides(),
+                sides: simplified_file_merge.num_sides(),
             });
         };
-        let content = extract_as_single_hunk(&file_merge, tree.store(), repo_path).block_on();
+        let content =
+            extract_as_single_hunk(&simplified_file_merge, tree.store(), repo_path).block_on()?;
 
         match &self.tool {
             MergeTool::Builtin => {
diff --git a/cli/src/revset_util.rs b/cli/src/revset_util.rs
index 9655e4e96a..96d3adeb80 100644
--- a/cli/src/revset_util.rs
+++ b/cli/src/revset_util.rs
@@ -134,17 +134,6 @@ pub fn load_revset_aliases(
             }
         }
     }
-
-    // TODO: If we add support for function overloading (#2966), this check can
-    // be removed.
-    let (_, params, _) = aliases_map.get_function(BUILTIN_IMMUTABLE_HEADS).unwrap();
-    if !params.is_empty() {
-        return Err(user_error(format!(
-            "The `revset-aliases.{name}()` function must be declared without arguments",
-            name = BUILTIN_IMMUTABLE_HEADS
-        )));
-    }
-
     Ok(aliases_map)
 }
 
@@ -171,22 +160,26 @@ pub fn default_symbol_resolver<'a>(
     DefaultSymbolResolver::new(repo, extensions).with_id_prefix_context(id_prefix_context)
 }
 
-/// Parses user-configured expression defining the immutable set.
-pub fn parse_immutable_expression(
+/// Parses user-configured expression defining the heads of the immutable set.
+/// Includes the root commit.
+pub fn parse_immutable_heads_expression(
     context: &RevsetParseContext,
 ) -> Result<Rc<RevsetExpression>, RevsetParseError> {
-    let (_, params, immutable_heads_str) = context
+    let (_, _, immutable_heads_str) = context
         .aliases_map()
-        .get_function(BUILTIN_IMMUTABLE_HEADS)
+        .get_function(BUILTIN_IMMUTABLE_HEADS, 0)
         .unwrap();
-    assert!(
-        params.is_empty(),
-        "invalid declaration should have been rejected by load_revset_aliases()"
-    );
+    let heads = revset::parse(immutable_heads_str, context)?;
+    Ok(heads.union(&RevsetExpression::root()))
+}
+
+/// Parses user-configured expression defining the immutable set.
+pub fn parse_immutable_expression(
+    context: &RevsetParseContext,
+) -> Result<Rc<RevsetExpression>, RevsetParseError> {
     // Negated ancestors expression `~::(<heads> | root())` is slightly easier
     // to optimize than negated union `~(::<heads> | root())`.
-    let heads = revset::parse(immutable_heads_str, context)?;
-    Ok(heads.union(&RevsetExpression::root()).ancestors())
+    Ok(parse_immutable_heads_expression(context)?.ancestors())
 }
 
 pub(super) fn evaluate_revset_to_single_commit<'a>(
diff --git a/cli/src/template_parser.rs b/cli/src/template_parser.rs
index 3bb2bb5114..99f418b0e8 100644
--- a/cli/src/template_parser.rs
+++ b/cli/src/template_parser.rs
@@ -220,7 +220,7 @@ impl AliasExpandError for TemplateParseError {
 
     fn within_alias_expansion(self, id: AliasId<'_>, span: pest::Span<'_>) -> Self {
         let kind = match id {
-            AliasId::Symbol(_) | AliasId::Function(_) => {
+            AliasId::Symbol(_) | AliasId::Function(..) => {
                 TemplateParseErrorKind::BadAliasExpansion(id.to_string())
             }
             AliasId::Parameter(_) => TemplateParseErrorKind::BadParameterExpansion(id.to_string()),
@@ -1028,16 +1028,36 @@ mod tests {
     fn test_parse_alias_decl() {
         let mut aliases_map = TemplateAliasesMap::new();
         aliases_map.insert("sym", r#""is symbol""#).unwrap();
-        aliases_map.insert("func(a)", r#""is function""#).unwrap();
+        aliases_map.insert("func()", r#""is function 0""#).unwrap();
+        aliases_map
+            .insert("func(a, b)", r#""is function 2""#)
+            .unwrap();
+        aliases_map.insert("func(a)", r#""is function a""#).unwrap();
+        aliases_map.insert("func(b)", r#""is function b""#).unwrap();
 
         let (id, defn) = aliases_map.get_symbol("sym").unwrap();
         assert_eq!(id, AliasId::Symbol("sym"));
         assert_eq!(defn, r#""is symbol""#);
 
-        let (id, params, defn) = aliases_map.get_function("func").unwrap();
-        assert_eq!(id, AliasId::Function("func"));
-        assert_eq!(params, ["a"]);
-        assert_eq!(defn, r#""is function""#);
+        let (id, params, defn) = aliases_map.get_function("func", 0).unwrap();
+        assert_eq!(id, AliasId::Function("func", &[]));
+        assert!(params.is_empty());
+        assert_eq!(defn, r#""is function 0""#);
+
+        let (id, params, defn) = aliases_map.get_function("func", 1).unwrap();
+        assert_eq!(id, AliasId::Function("func", &["b".to_owned()]));
+        assert_eq!(params, ["b"]);
+        assert_eq!(defn, r#""is function b""#);
+
+        let (id, params, defn) = aliases_map.get_function("func", 2).unwrap();
+        assert_eq!(
+            id,
+            AliasId::Function("func", &["a".to_owned(), "b".to_owned()])
+        );
+        assert_eq!(params, ["a", "b"]);
+        assert_eq!(defn, r#""is function 2""#);
+
+        assert!(aliases_map.get_function("func", 3).is_none());
 
         // Formal parameter 'a' can't be redefined
         assert_eq!(
@@ -1149,6 +1169,12 @@ mod tests {
             parse_normalized("a ++ b"),
         );
 
+        // Not recursion because functions are overloaded by arity.
+        assert_eq!(
+            with_aliases([("F(x)", "F(x,b)"), ("F(x,y)", "x ++ y")]).parse_normalized("F(a)"),
+            parse_normalized("a ++ b")
+        );
+
         // Arguments should be resolved in the current scope.
         assert_eq!(
             with_aliases([("F(x,y)", "if(x, y)")]).parse_normalized("F(a ++ y, b ++ x)"),
@@ -1219,7 +1245,14 @@ mod tests {
                 .parse("F(a)")
                 .unwrap_err()
                 .kind,
-            TemplateParseErrorKind::BadAliasExpansion("F()".to_owned()),
+            TemplateParseErrorKind::BadAliasExpansion("F(x)".to_owned()),
+        );
+        assert_eq!(
+            with_aliases([("F(x)", "F(x,b)"), ("F(x,y)", "F(x|y)")])
+                .parse("F(a)")
+                .unwrap_err()
+                .kind,
+            TemplateParseErrorKind::BadAliasExpansion("F(x)".to_owned())
         );
     }
 }
diff --git a/cli/src/ui.rs b/cli/src/ui.rs
index 2f21ed0e14..38dcaef571 100644
--- a/cli/src/ui.rs
+++ b/cli/src/ui.rs
@@ -23,7 +23,9 @@ use tracing::instrument;
 
 use crate::command_error::{config_error_with_message, CommandError};
 use crate::config::CommandNameAndArgs;
-use crate::formatter::{Formatter, FormatterFactory, HeadingLabeledWriter, LabeledWriter};
+use crate::formatter::{
+    Formatter, FormatterFactory, HeadingLabeledWriter, LabeledWriter, PlainTextFormatter,
+};
 
 const BUILTIN_PAGER_NAME: &str = ":builtin";
 
@@ -47,15 +49,15 @@ pub struct BuiltinPager {
     dynamic_pager_thread: JoinHandle<()>,
 }
 
-impl std::io::Write for &BuiltinPager {
+impl Write for &BuiltinPager {
     fn flush(&mut self) -> io::Result<()> {
         // no-op since this is being run in a dynamic pager mode.
         Ok(())
     }
 
     fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
-        let string = std::str::from_utf8(buf).map_err(std::io::Error::other)?;
-        self.pager.push_str(string).map_err(std::io::Error::other)?;
+        let string = std::str::from_utf8(buf).map_err(io::Error::other)?;
+        self.pager.push_str(string).map_err(io::Error::other)?;
         Ok(buf.len())
     }
 }
@@ -395,7 +397,7 @@ impl Ui {
     /// Writer to print an update that's not part of the command's main output.
     pub fn status(&self) -> Box<dyn Write + '_> {
         if self.quiet {
-            Box::new(std::io::sink())
+            Box::new(io::sink())
         } else {
             Box::new(self.stderr())
         }
@@ -410,21 +412,24 @@ impl Ui {
     /// Writer to print hint with the default "Hint: " heading.
     pub fn hint_default(
         &self,
-    ) -> Option<HeadingLabeledWriter<Box<dyn Formatter + '_>, &'static str, &'static str>> {
+    ) -> HeadingLabeledWriter<Box<dyn Formatter + '_>, &'static str, &'static str> {
         self.hint_with_heading("Hint: ")
     }
 
     /// Writer to print hint without the "Hint: " heading.
-    pub fn hint_no_heading(&self) -> Option<LabeledWriter<Box<dyn Formatter + '_>, &'static str>> {
-        (!self.quiet).then(|| LabeledWriter::new(self.stderr_formatter(), "hint"))
+    pub fn hint_no_heading(&self) -> LabeledWriter<Box<dyn Formatter + '_>, &'static str> {
+        let formatter = self
+            .status_formatter()
+            .unwrap_or_else(|| Box::new(PlainTextFormatter::new(io::sink())));
+        LabeledWriter::new(formatter, "hint")
     }
 
     /// Writer to print hint with the given heading.
     pub fn hint_with_heading<H: fmt::Display>(
         &self,
         heading: H,
-    ) -> Option<HeadingLabeledWriter<Box<dyn Formatter + '_>, &'static str, H>> {
-        (!self.quiet).then(|| HeadingLabeledWriter::new(self.stderr_formatter(), "hint", heading))
+    ) -> HeadingLabeledWriter<Box<dyn Formatter + '_>, &'static str, H> {
+        self.hint_no_heading().with_heading(heading)
     }
 
     /// Writer to print warning with the default "Warning: " heading.
@@ -444,7 +449,7 @@ impl Ui {
         &self,
         heading: H,
     ) -> HeadingLabeledWriter<Box<dyn Formatter + '_>, &'static str, H> {
-        HeadingLabeledWriter::new(self.stderr_formatter(), "warning", heading)
+        self.warning_no_heading().with_heading(heading)
     }
 
     /// Writer to print error without the "Error: " heading.
@@ -457,7 +462,7 @@ impl Ui {
         &self,
         heading: H,
     ) -> HeadingLabeledWriter<Box<dyn Formatter + '_>, &'static str, H> {
-        HeadingLabeledWriter::new(self.stderr_formatter(), "error", heading)
+        self.error_no_heading().with_heading(heading)
     }
 
     /// Waits for the pager exits.
diff --git a/cli/tests/cli-reference@.md.snap b/cli/tests/cli-reference@.md.snap
index 49ab95d811..516da42ffa 100644
--- a/cli/tests/cli-reference@.md.snap
+++ b/cli/tests/cli-reference@.md.snap
@@ -1,6 +1,6 @@
 ---
 source: cli/tests/test_generate_md_cli_help.rs
-description: "AUTO-GENERATED FILE, DO NOT EDIT. This cli reference is generated as an `insta` snapshot. MkDocs follows they symlink from docs/cli-reference.md to the snap. Unfortunately, `insta` unavoidably creates this header. Luckily, MkDocs ignores the header since it has the same format as Markdown headers. TODO: MkDocs may fail on Windows if symlinks are not enabled in the OS settings"
+description: "AUTO-GENERATED FILE, DO NOT EDIT. This cli reference is generated by a test as an `insta` snapshot. MkDocs includes this snapshot from docs/cli-reference.md."
 ---
 <!-- BEGIN MARKDOWN-->
 
@@ -18,38 +18,41 @@ This document contains the help content for the `jj` command-line program.
 * [`jj branch delete`↴](#jj-branch-delete)
 * [`jj branch forget`↴](#jj-branch-forget)
 * [`jj branch list`↴](#jj-branch-list)
+* [`jj branch move`↴](#jj-branch-move)
 * [`jj branch rename`↴](#jj-branch-rename)
 * [`jj branch set`↴](#jj-branch-set)
 * [`jj branch track`↴](#jj-branch-track)
 * [`jj branch untrack`↴](#jj-branch-untrack)
-* [`jj cat`↴](#jj-cat)
-* [`jj chmod`↴](#jj-chmod)
 * [`jj commit`↴](#jj-commit)
 * [`jj config`↴](#jj-config)
-* [`jj config list`↴](#jj-config-list)
-* [`jj config get`↴](#jj-config-get)
-* [`jj config set`↴](#jj-config-set)
 * [`jj config edit`↴](#jj-config-edit)
+* [`jj config get`↴](#jj-config-get)
+* [`jj config list`↴](#jj-config-list)
 * [`jj config path`↴](#jj-config-path)
+* [`jj config set`↴](#jj-config-set)
 * [`jj describe`↴](#jj-describe)
 * [`jj diff`↴](#jj-diff)
 * [`jj diffedit`↴](#jj-diffedit)
 * [`jj duplicate`↴](#jj-duplicate)
 * [`jj edit`↴](#jj-edit)
-* [`jj files`↴](#jj-files)
+* [`jj file`↴](#jj-file)
+* [`jj file chmod`↴](#jj-file-chmod)
+* [`jj file list`↴](#jj-file-list)
+* [`jj file show`↴](#jj-file-show)
 * [`jj fix`↴](#jj-fix)
 * [`jj git`↴](#jj-git)
+* [`jj git clone`↴](#jj-git-clone)
+* [`jj git export`↴](#jj-git-export)
+* [`jj git fetch`↴](#jj-git-fetch)
+* [`jj git import`↴](#jj-git-import)
+* [`jj git init`↴](#jj-git-init)
+* [`jj git push`↴](#jj-git-push)
 * [`jj git remote`↴](#jj-git-remote)
 * [`jj git remote add`↴](#jj-git-remote-add)
+* [`jj git remote list`↴](#jj-git-remote-list)
 * [`jj git remote remove`↴](#jj-git-remote-remove)
 * [`jj git remote rename`↴](#jj-git-remote-rename)
-* [`jj git remote list`↴](#jj-git-remote-list)
-* [`jj git init`↴](#jj-git-init)
-* [`jj git fetch`↴](#jj-git-fetch)
-* [`jj git clone`↴](#jj-git-clone)
-* [`jj git push`↴](#jj-git-push)
-* [`jj git import`↴](#jj-git-import)
-* [`jj git export`↴](#jj-git-export)
+* [`jj git remote set-url`↴](#jj-git-remote-set-url)
 * [`jj init`↴](#jj-init)
 * [`jj interdiff`↴](#jj-interdiff)
 * [`jj log`↴](#jj-log)
@@ -59,8 +62,8 @@ This document contains the help content for the `jj` command-line program.
 * [`jj operation`↴](#jj-operation)
 * [`jj operation abandon`↴](#jj-operation-abandon)
 * [`jj operation log`↴](#jj-operation-log)
-* [`jj operation undo`↴](#jj-operation-undo)
 * [`jj operation restore`↴](#jj-operation-restore)
+* [`jj operation undo`↴](#jj-operation-undo)
 * [`jj parallelize`↴](#jj-parallelize)
 * [`jj prev`↴](#jj-prev)
 * [`jj rebase`↴](#jj-rebase)
@@ -69,10 +72,10 @@ This document contains the help content for the `jj` command-line program.
 * [`jj root`↴](#jj-root)
 * [`jj show`↴](#jj-show)
 * [`jj sparse`↴](#jj-sparse)
+* [`jj sparse edit`↴](#jj-sparse-edit)
 * [`jj sparse list`↴](#jj-sparse-list)
-* [`jj sparse set`↴](#jj-sparse-set)
 * [`jj sparse reset`↴](#jj-sparse-reset)
-* [`jj sparse edit`↴](#jj-sparse-edit)
+* [`jj sparse set`↴](#jj-sparse-set)
 * [`jj split`↴](#jj-split)
 * [`jj squash`↴](#jj-squash)
 * [`jj status`↴](#jj-status)
@@ -108,8 +111,6 @@ To get started, see the tutorial at https://github.com/martinvonz/jj/blob/main/d
 * `abandon` — Abandon a revision
 * `backout` — Apply the reverse of a revision on top of another revision
 * `branch` — Manage branches
-* `cat` — Print contents of files in a revision
-* `chmod` — Sets or removes the executable bit for paths in the repo
 * `commit` — Update the description and create a new change on top
 * `config` — Manage config options
 * `describe` — Update the change description or other metadata
@@ -117,7 +118,7 @@ To get started, see the tutorial at https://github.com/martinvonz/jj/blob/main/d
 * `diffedit` — Touch up the content changes in a revision with a diff editor
 * `duplicate` — Create a new change with the same content as an existing one
 * `edit` — Sets the specified revision as the working-copy revision
-* `files` — List files in a revision
+* `file` — File operations
 * `fix` — Update files with formatting fixes or other changes
 * `git` — Commands for working with Git remotes and the underlying Git repo
 * `init` — Create a new repo in the given directory
@@ -149,30 +150,37 @@ To get started, see the tutorial at https://github.com/martinvonz/jj/blob/main/d
 ###### **Options:**
 
 * `-R`, `--repository <REPOSITORY>` — Path to repository to operate on
+
+   By default, Jujutsu searches for the closest .jj/ directory in an ancestor of the current working directory.
 * `--ignore-working-copy` — Don't snapshot the working copy, and don't update it
 
-  Possible values: `true`, `false`
+   By default, Jujutsu snapshots the working copy at the beginning of every command. The working copy is also updated at the end of the command, if the command modified the working-copy commit (`@`). If you want to avoid snapshotting the working copy and instead see a possibly stale working copy commit, you can use `--ignore-working-copy`. This may be useful e.g. in a command prompt, especially if you have another process that commits the working copy.
 
+   Loading the repository at a specific operation with `--at-operation` implies `--ignore-working-copy`.
 * `--ignore-immutable` — Allow rewriting immutable commits
 
-  Possible values: `true`, `false`
+   By default, Jujutsu prevents rewriting commits in the configured set of immutable commits. This option disables that check and lets you rewrite any commit but the root commit.
 
+   This option only affects the check. It does not affect the `immutable_heads()` revset or the `immutable` template keyword.
 * `--at-operation <AT_OPERATION>` — Operation to load the repo at
 
-  Default value: `@`
-* `--debug` — Enable debug logging
+   Operation to load the repo at. By default, Jujutsu loads the repo at the most recent operation. You can use `--at-op=<operation ID>` to see what the repo looked like at an earlier operation. For example `jj --at-op=<operation ID> st` will show you what `jj st` would have shown you when the given operation had just finished.
+
+   Use `jj op log` to find the operation ID you want. Any unambiguous prefix of the operation ID is enough.
 
-  Possible values: `true`, `false`
+   When loading the repo at an earlier operation, the working copy will be ignored, as if `--ignore-working-copy` had been specified.
 
+   It is possible to run mutating commands when loading the repo at an earlier operation. Doing that is equivalent to having run concurrent commands starting at the earlier operation. There's rarely a reason to do that, but it is possible.
+
+  Default value: `@`
+* `--debug` — Enable debug logging
 * `--color <WHEN>` — When to colorize output (always, never, debug, auto)
 * `--quiet` — Silence non-primary command output
 
-  Possible values: `true`, `false`
+   For example, `jj file list ` will still list files, but it won't tell you if the working copy was snapshotted or if descendants were rebased.
 
+   Warnings and errors will still be printed.
 * `--no-pager` — Disable the pager
-
-  Possible values: `true`, `false`
-
 * `--config-toml <TOML>` — Additional configuration options (can be repeated)
 
 
@@ -197,10 +205,6 @@ If a working-copy commit gets abandoned, it will be given a new, empty commit. T
 
 * `-s`, `--summary` — Do not print every abandoned commit on a separate line
 
-  Possible values: `true`, `false`
-
-* `-r` — Ignored (but lets you pass `-r` for consistency with other commands)
-
 
 
 ## `jj backout`
@@ -222,7 +226,7 @@ Apply the reverse of a revision on top of another revision
 
 ## `jj branch`
 
-Manage branches.
+Manage branches
 
 For information about branches, see https://github.com/martinvonz/jj/blob/main/docs/branches.md.
 
@@ -234,8 +238,9 @@ For information about branches, see https://github.com/martinvonz/jj/blob/main/d
 * `delete` — Delete an existing branch and propagate the deletion to remotes on the next push
 * `forget` — Forget everything about a branch, including its local and remote targets
 * `list` — List branches and their targets
+* `move` — Move existing branches to target revision
 * `rename` — Rename `old` branch name to `new` branch name
-* `set` — Update an existing branch to point to a certain commit
+* `set` — Create or update a branch to point to a certain commit
 * `track` — Start tracking given remote branches
 * `untrack` — Stop tracking given remote branches
 
@@ -261,33 +266,29 @@ Create a new branch
 
 Delete an existing branch and propagate the deletion to remotes on the next push
 
-**Usage:** `jj branch delete [NAMES]...`
+**Usage:** `jj branch delete <NAMES>...`
 
 ###### **Arguments:**
 
 * `<NAMES>` — The branches to delete
 
-###### **Options:**
-
-* `--glob <GLOB>` — Deprecated. Please prefix the pattern with `glob:` instead
+   By default, the specified name matches exactly. Use `glob:` prefix to select branches by wildcard pattern. For details, see https://github.com/martinvonz/jj/blob/main/docs/revsets.md#string-patterns.
 
 
 
 ## `jj branch forget`
 
-Forget everything about a branch, including its local and remote targets.
+Forget everything about a branch, including its local and remote targets
 
 A forgotten branch will not impact remotes on future pushes. It will be recreated on future pulls if it still exists in the remote.
 
-**Usage:** `jj branch forget [NAMES]...`
+**Usage:** `jj branch forget <NAMES>...`
 
 ###### **Arguments:**
 
 * `<NAMES>` — The branches to forget
 
-###### **Options:**
-
-* `--glob <GLOB>` — Deprecated. Please prefix the pattern with `glob:` instead
+   By default, the specified name matches exactly. Use `glob:` prefix to select branches by wildcard pattern. For details, see https://github.com/martinvonz/jj/blob/main/docs/revsets.md#string-patterns.
 
 
 
@@ -305,28 +306,57 @@ For information about branches, see https://github.com/martinvonz/jj/blob/main/d
 
 * `<NAMES>` — Show branches whose local name matches
 
+   By default, the specified name matches exactly. Use `glob:` prefix to select branches by wildcard pattern. For details, see https://github.com/martinvonz/jj/blob/main/docs/revsets.md#string-patterns.
+
 ###### **Options:**
 
 * `-a`, `--all-remotes` — Show all tracking and non-tracking remote branches including the ones whose targets are synchronized with the local branches
+* `-t`, `--tracked` — Show remote tracked branches only. Omits local Git-tracking branches by default
+* `-c`, `--conflicted` — Show conflicted branches only
+* `-r`, `--revisions <REVISIONS>` — Show branches whose local targets are in the given revisions
 
-  Possible values: `true`, `false`
+   Note that `-r deleted_branch` will not work since `deleted_branch` wouldn't have a local target.
+* `-T`, `--template <TEMPLATE>` — Render each branch using the given template
 
-* `-t`, `--tracked` — Show remote tracked branches only. Omits local Git-tracking branches by default
+   All 0-argument methods of the `RefName` type are available as keywords.
 
-  Possible values: `true`, `false`
+   For the syntax, see https://github.com/martinvonz/jj/blob/main/docs/templates.md
 
-* `-c`, `--conflicted` — Show conflicted branches only
 
-  Possible values: `true`, `false`
 
-* `-r`, `--revisions <REVISIONS>` — Show branches whose local targets are in the given revisions
-* `-T`, `--template <TEMPLATE>` — Render each branch using the given template
+## `jj branch move`
+
+Move existing branches to target revision
+
+If branch names are given, the specified branches will be updated to point to the target revision.
+
+If `--from` options are given, branches currently pointing to the specified revisions will be updated. The branches can also be filtered by names.
+
+Example: pull up the nearest branches to the working-copy parent
+
+$ jj branch move --from 'heads(::@- & branches())' --to @-
+
+**Usage:** `jj branch move [OPTIONS] <--from <REVISIONS>|NAMES>`
+
+###### **Arguments:**
+
+* `<NAMES>` — Move branches matching the given name patterns
+
+   By default, the specified name matches exactly. Use `glob:` prefix to select branches by wildcard pattern. For details, see https://github.com/martinvonz/jj/blob/main/docs/revsets.md#string-patterns.
+
+###### **Options:**
+
+* `--from <REVISIONS>` — Move branches from the given revisions
+* `--to <REVISION>` — Move branches to this revision
+
+  Default value: `@`
+* `-B`, `--allow-backwards` — Allow moving branches backwards or sideways
 
 
 
 ## `jj branch rename`
 
-Rename `old` branch name to `new` branch name.
+Rename `old` branch name to `new` branch name
 
 The new branch name points at the same commit as the old branch name.
 
@@ -341,7 +371,7 @@ The new branch name points at the same commit as the old branch name.
 
 ## `jj branch set`
 
-Update an existing branch to point to a certain commit
+Create or update a branch to point to a certain commit
 
 **Usage:** `jj branch set [OPTIONS] <NAMES>...`
 
@@ -354,9 +384,6 @@ Update an existing branch to point to a certain commit
 * `-r`, `--revision <REVISION>` — The branch's target revision
 * `-B`, `--allow-backwards` — Allow moving the branch backwards or sideways
 
-  Possible values: `true`, `false`
-
-
 
 
 ## `jj branch track`
@@ -371,6 +398,10 @@ A tracking remote branch will be imported as a local branch of the same name. Ch
 
 * `<BRANCH@REMOTE>` — Remote branches to track
 
+   By default, the specified name matches exactly. Use `glob:` prefix to select branches by wildcard pattern. For details, see https://github.com/martinvonz/jj/blob/main/docs/revsets.md#string-patterns.
+
+   Examples: branch@remote, glob:main@*, glob:jjfan-*@upstream
+
 
 
 ## `jj branch untrack`
@@ -385,53 +416,9 @@ A non-tracking remote branch is just a pointer to the last-fetched remote branch
 
 * `<BRANCH@REMOTE>` — Remote branches to untrack
 
+   By default, the specified name matches exactly. Use `glob:` prefix to select branches by wildcard pattern. For details, see https://github.com/martinvonz/jj/blob/main/docs/revsets.md#string-patterns.
 
-
-## `jj cat`
-
-Print contents of files in a revision
-
-If the given path is a directory, files in the directory will be visited recursively.
-
-**Usage:** `jj cat [OPTIONS] <PATHS>...`
-
-###### **Arguments:**
-
-* `<PATHS>` — Paths to print
-
-###### **Options:**
-
-* `-r`, `--revision <REVISION>` — The revision to get the file contents from
-
-  Default value: `@`
-
-
-
-## `jj chmod`
-
-Sets or removes the executable bit for paths in the repo
-
-Unlike the POSIX `chmod`, `jj chmod` also works on Windows, on conflicted files, and on arbitrary revisions.
-
-**Usage:** `jj chmod [OPTIONS] <MODE> <PATHS>...`
-
-###### **Arguments:**
-
-* `<MODE>`
-
-  Possible values:
-  - `n`:
-    Make a path non-executable (alias: normal)
-  - `x`:
-    Make a path executable (alias: executable)
-
-* `<PATHS>` — Paths to change the executable bit for
-
-###### **Options:**
-
-* `-r`, `--revision <REVISION>` — The revision to update
-
-  Default value: `@`
+   Examples: branch@remote, glob:main@*, glob:jjfan-*@upstream
 
 
 
@@ -448,9 +435,6 @@ Update the description and create a new change on top
 ###### **Options:**
 
 * `-i`, `--interactive` — Interactively choose which changes to include in the first commit
-
-  Possible values: `true`, `false`
-
 * `--tool <NAME>` — Specify diff editor to be used (implies --interactive)
 * `-m`, `--message <MESSAGE>` — The change description to use (don't open editor)
 
@@ -468,44 +452,27 @@ For file locations, supported config options, and other details about jj config,
 
 ###### **Subcommands:**
 
-* `list` — List variables set in config file, along with their values
-* `get` — Get the value of a given config option.
-* `set` — Update config file to set the given option to a given value
 * `edit` — Start an editor on a jj config file
+* `get` — Get the value of a given config option.
+* `list` — List variables set in config file, along with their values
 * `path` — Print the path to the config file
+* `set` — Update config file to set the given option to a given value
 
 
 
-## `jj config list`
-
-List variables set in config file, along with their values
+## `jj config edit`
 
-**Usage:** `jj config list [OPTIONS] [NAME]`
+Start an editor on a jj config file.
 
-###### **Arguments:**
+Creates the file if it doesn't already exist regardless of what the editor does.
 
-* `<NAME>` — An optional name of a specific config option to look up
+**Usage:** `jj config edit <--user|--repo>`
 
 ###### **Options:**
 
-* `--include-defaults` — Whether to explicitly include built-in default values in the list
-
-  Possible values: `true`, `false`
-
-* `--include-overridden` — Allow printing overridden values
-
-  Possible values: `true`, `false`
-
 * `--user` — Target the user-level config
-
-  Possible values: `true`, `false`
-
 * `--repo` — Target the repo-level config
 
-  Possible values: `true`, `false`
-
-* `-T`, `--template <TEMPLATE>` — Render each variable using the given template
-
 
 
 ## `jj config get`
@@ -528,72 +495,67 @@ Martin von Zweigbergk
 
 
 
-## `jj config set`
+## `jj config list`
 
-Update config file to set the given option to a given value
+List variables set in config file, along with their values
 
-**Usage:** `jj config set <--user|--repo> <NAME> <VALUE>`
+**Usage:** `jj config list [OPTIONS] [NAME]`
 
 ###### **Arguments:**
 
-* `<NAME>`
-* `<VALUE>`
+* `<NAME>` — An optional name of a specific config option to look up
 
 ###### **Options:**
 
+* `--include-defaults` — Whether to explicitly include built-in default values in the list
+* `--include-overridden` — Allow printing overridden values
 * `--user` — Target the user-level config
+* `--repo` — Target the repo-level config
+* `-T`, `--template <TEMPLATE>` — Render each variable using the given template
 
-  Possible values: `true`, `false`
+   The following keywords are defined:
 
-* `--repo` — Target the repo-level config
+   * `name: String`: Config name.
+   * `value: String`: Serialized value in TOML syntax.
+   * `overridden: Boolean`: True if the value is shadowed by other.
 
-  Possible values: `true`, `false`
+   For the syntax, see https://github.com/martinvonz/jj/blob/main/docs/templates.md
 
 
 
+## `jj config path`
 
-## `jj config edit`
+Print the path to the config file
 
-Start an editor on a jj config file.
+A config file at that path may or may not exist.
 
-Creates the file if it doesn't already exist regardless of what the editor does.
+See `jj config edit` if you'd like to immediately edit the file.
 
-**Usage:** `jj config edit <--user|--repo>`
+**Usage:** `jj config path <--user|--repo>`
 
 ###### **Options:**
 
 * `--user` — Target the user-level config
-
-  Possible values: `true`, `false`
-
 * `--repo` — Target the repo-level config
 
-  Possible values: `true`, `false`
-
-
 
 
-## `jj config path`
+## `jj config set`
 
-Print the path to the config file
+Update config file to set the given option to a given value
 
-A config file at that path may or may not exist.
+**Usage:** `jj config set <--user|--repo> <NAME> <VALUE>`
 
-See `jj config edit` if you'd like to immediately edit the file.
+###### **Arguments:**
 
-**Usage:** `jj config path <--user|--repo>`
+* `<NAME>`
+* `<VALUE>`
 
 ###### **Options:**
 
 * `--user` — Target the user-level config
-
-  Possible values: `true`, `false`
-
 * `--repo` — Target the repo-level config
 
-  Possible values: `true`, `false`
-
-
 
 
 ## `jj describe`
@@ -612,23 +574,18 @@ Starts an editor to let you edit the description of a change. The editor will be
 
 ###### **Options:**
 
-* `-r` — Ignored (but lets you pass `-r` for consistency with other commands)
-
-  Possible values: `true`, `false`
-
 * `-m`, `--message <MESSAGE>` — The change description to use (don't open editor)
 * `--stdin` — Read the change description from stdin
-
-  Possible values: `true`, `false`
-
 * `--no-edit` — Don't open an editor
 
-  Possible values: `true`, `false`
-
+   This is mainly useful in combination with e.g. `--reset-author`.
 * `--reset-author` — Reset the author to the configured user
 
-  Possible values: `true`, `false`
+   This resets the author name, email, and timestamp.
+
+   You can use it in combination with the JJ_USER and JJ_EMAIL environment variables to set a different author:
 
+   $ JJ_USER='Foo Bar' JJ_EMAIL=foo@bar.com jj describe --reset-author
 
 
 
@@ -649,28 +606,20 @@ With the `--from` and/or `--to` options, shows the difference from/to the given
 ###### **Options:**
 
 * `-r`, `--revision <REVISION>` — Show changes in this revision, compared to its parent(s)
+
+   If the revision is a merge commit, this shows changes *from* the automatic merge of the contents of all of its parents *to* the contents of the revision itself.
 * `--from <FROM>` — Show changes from this revision
 * `--to <TO>` — Show changes to this revision
 * `-s`, `--summary` — For each path, show only whether it was modified, added, or deleted
-
-  Possible values: `true`, `false`
-
 * `--stat` — Show a histogram of the changes
-
-  Possible values: `true`, `false`
-
 * `--types` — For each path, show only its type before and after
 
-  Possible values: `true`, `false`
+   The diff is shown as two letters. The first letter indicates the type before and the second letter indicates the type after. '-' indicates that the path was not present, 'F' represents a regular file, `L' represents a symlink, 'C' represents a conflict, and 'G' represents a Git submodule.
+* `--name-only` — For each path, show only its path
 
+   Typically useful for shell commands like: `jj diff -r @- --name_only | xargs perl -pi -e's/OLD/NEW/g`
 * `--git` — Show a Git-format diff
-
-  Possible values: `true`, `false`
-
 * `--color-words` — Show a word-level diff with changes indicated only by color
-
-  Possible values: `true`, `false`
-
 * `--tool <TOOL>` — Generate diff by external command
 * `--context <CONTEXT>` — Number of lines of context to show
 
@@ -713,10 +662,6 @@ Create a new change with the same content as an existing one
 
   Default value: `@`
 
-###### **Options:**
-
-* `-r` — Ignored (but lets you pass `-r` for consistency with other commands)
-
 
 
 ## `jj edit`
@@ -733,20 +678,55 @@ For more information, see https://martinvonz.github.io/jj/latest/FAQ#how-do-i-re
 
 * `<REVISION>` — The commit to edit
 
-###### **Options:**
 
-* `-r` — Ignored (but lets you pass `-r` for consistency with other commands)
 
-  Possible values: `true`, `false`
+## `jj file`
+
+File operations
+
+**Usage:** `jj file <COMMAND>`
+
+###### **Subcommands:**
+
+* `chmod` — Sets or removes the executable bit for paths in the repo
+* `list` — List files in a revision
+* `show` — Print contents of files in a revision
+
+
+
+## `jj file chmod`
 
+Sets or removes the executable bit for paths in the repo
 
+Unlike the POSIX `chmod`, `jj file chmod` also works on Windows, on conflicted files, and on arbitrary revisions.
 
+**Usage:** `jj file chmod [OPTIONS] <MODE> <PATHS>...`
 
-## `jj files`
+###### **Arguments:**
+
+* `<MODE>`
+
+  Possible values:
+  - `n`:
+    Make a path non-executable (alias: normal)
+  - `x`:
+    Make a path executable (alias: executable)
+
+* `<PATHS>` — Paths to change the executable bit for
+
+###### **Options:**
+
+* `-r`, `--revision <REVISION>` — The revision to update
+
+  Default value: `@`
+
+
+
+## `jj file list`
 
 List files in a revision
 
-**Usage:** `jj files [OPTIONS] [PATHS]...`
+**Usage:** `jj file list [OPTIONS] [PATHS]...`
 
 ###### **Arguments:**
 
@@ -760,6 +740,26 @@ List files in a revision
 
 
 
+## `jj file show`
+
+Print contents of files in a revision
+
+If the given path is a directory, files in the directory will be visited recursively.
+
+**Usage:** `jj file show [OPTIONS] <PATHS>...`
+
+###### **Arguments:**
+
+* `<PATHS>` — Paths to print
+
+###### **Options:**
+
+* `-r`, `--revision <REVISION>` — The revision to get the file contents from
+
+  Default value: `@`
+
+
+
 ## `jj fix`
 
 Update files with formatting fixes or other changes
@@ -812,98 +812,40 @@ For a comparison with Git, including a table of commands, see https://github.com
 
 ###### **Subcommands:**
 
-* `remote` — Manage Git remotes
-* `init` — Create a new Git backed repo
-* `fetch` — Fetch from a Git remote
 * `clone` — Create a new repo backed by a clone of a Git repo
-* `push` — Push to a Git remote
-* `import` — Update repo with changes made in the underlying Git repo
 * `export` — Update the underlying Git repo with changes made in the repo
+* `fetch` — Fetch from a Git remote
+* `import` — Update repo with changes made in the underlying Git repo
+* `init` — Create a new Git backed repo
+* `push` — Push to a Git remote
+* `remote` — Manage Git remotes
 
 
 
-## `jj git remote`
+## `jj git clone`
 
-Manage Git remotes
+Create a new repo backed by a clone of a Git repo
 
 The Git repo will be a bare git repo stored inside the `.jj/` directory.
 
-**Usage:** `jj git remote <COMMAND>`
-
-###### **Subcommands:**
-
-* `add` — Add a Git remote
-* `remove` — Remove a Git remote and forget its branches
-* `rename` — Rename a Git remote
-* `list` — List Git remotes
-
-
-
-## `jj git remote add`
-
-Add a Git remote
-
-**Usage:** `jj git remote add <REMOTE> <URL>`
-
-###### **Arguments:**
-
-* `<REMOTE>` — The remote's name
-* `<URL>` — The remote's URL
-
-
-
-## `jj git remote remove`
-
-Remove a Git remote and forget its branches
-
-**Usage:** `jj git remote remove <REMOTE>`
-
-###### **Arguments:**
-
-* `<REMOTE>` — The remote's name
-
-
-
-## `jj git remote rename`
-
-Rename a Git remote
-
-**Usage:** `jj git remote rename <OLD> <NEW>`
+**Usage:** `jj git clone [OPTIONS] <SOURCE> [DESTINATION]`
 
 ###### **Arguments:**
 
-* `<OLD>` — The name of an existing remote
-* `<NEW>` — The desired name for `old`
-
-
-
-## `jj git remote list`
-
-List Git remotes
-
-**Usage:** `jj git remote list`
-
-
-
-## `jj git init`
-
-Create a new Git backed repo
-
-**Usage:** `jj git init [OPTIONS] [DESTINATION]`
+* `<SOURCE>` — URL or path of the Git repo to clone
+* `<DESTINATION>` — The directory to write the Jujutsu repo to
 
-###### **Arguments:**
+###### **Options:**
 
-* `<DESTINATION>` — The destination directory where the `jj` repo will be created. If the directory does not exist, it will be created. If no directory is given, the current directory is used
+* `--colocate` — Whether or not to colocate the Jujutsu repo with the git repo
 
-  Default value: `.`
 
-###### **Options:**
 
-* `--colocate` — Specifies that the `jj` repo should also be a valid `git` repo, allowing the use of both `jj` and `git` commands in the same directory
+## `jj git export`
 
-  Possible values: `true`, `false`
+Update the underlying Git repo with changes made in the repo
 
-* `--git-repo <GIT_REPO>` — Specifies a path to an **existing** git repository to be used as the backing git repo for the newly created `jj` repo
+**Usage:** `jj git export`
 
 
 
@@ -919,34 +861,50 @@ If a working-copy commit gets abandoned, it will be given a new, empty commit. T
 
 * `-b`, `--branch <BRANCH>` — Fetch only some of the branches
 
+   By default, the specified name matches exactly. Use `glob:` prefix to expand `*` as a glob. The other wildcard characters aren't supported.
+
   Default value: `glob:*`
 * `--remote <remote>` — The remote to fetch from (only named remotes are supported, can be repeated)
 * `--all-remotes` — Fetch from all remotes
 
-  Possible values: `true`, `false`
 
 
+## `jj git import`
 
+Update repo with changes made in the underlying Git repo
 
-## `jj git clone`
+If a working-copy commit gets abandoned, it will be given a new, empty commit. This is true in general; it is not specific to this command.
 
-Create a new repo backed by a clone of a Git repo
+**Usage:** `jj git import`
 
-The Git repo will be a bare git repo stored inside the `.jj/` directory.
 
-**Usage:** `jj git clone [OPTIONS] <SOURCE> [DESTINATION]`
+
+## `jj git init`
+
+Create a new Git backed repo
+
+**Usage:** `jj git init [OPTIONS] [DESTINATION]`
 
 ###### **Arguments:**
 
-* `<SOURCE>` — URL or path of the Git repo to clone
-* `<DESTINATION>` — The directory to write the Jujutsu repo to
+* `<DESTINATION>` — The destination directory where the `jj` repo will be created. If the directory does not exist, it will be created. If no directory is given, the current directory is used.
+
+   By default the `git` repo is under `$destination/.jj`
+
+  Default value: `.`
 
 ###### **Options:**
 
-* `--colocate` — Whether or not to colocate the Jujutsu repo with the git repo
+* `--colocate` — Specifies that the `jj` repo should also be a valid `git` repo, allowing the use of both `jj` and `git` commands in the same directory.
+
+   This is done by placing the backing git repo into a `.git` directory in the root of the `jj` repo along with the `.jj` directory. If the `.git` directory already exists, all the existing commits will be imported.
+
+   This option is mutually exclusive with `--git-repo`.
+* `--git-repo <GIT_REPO>` — Specifies a path to an **existing** git repository to be used as the backing git repo for the newly created `jj` repo.
 
-  Possible values: `true`, `false`
+   If the specified `--git-repo` path happens to be the same as the `jj` repo path (both .jj and .git directories are in the same working directory), then both `jj` and `git` commands will work on the same repo. This is called a co-located repo.
 
+   This option is mutually exclusive with `--colocate`.
 
 
 
@@ -968,46 +926,96 @@ Before the command actually moves, creates, or deletes a remote branch, it makes
 
 * `--remote <REMOTE>` — The remote to push to (only named remotes are supported)
 * `-b`, `--branch <BRANCH>` — Push only this branch, or branches matching a pattern (can be repeated)
-* `--all` — Push all branches (including deleted branches)
-
-  Possible values: `true`, `false`
 
+   By default, the specified name matches exactly. Use `glob:` prefix to select branches by wildcard pattern. For details, see https://martinvonz.github.io/jj/latest/revsets#string-patterns.
+* `--all` — Push all branches (including deleted branches)
 * `--tracked` — Push all tracked branches (including deleted branches)
 
-  Possible values: `true`, `false`
-
+   This usually means that the branch was already pushed to or fetched from the relevant remote. For details, see https://martinvonz.github.io/jj/latest/branches#remotes-and-tracked-branches
 * `--deleted` — Push all deleted branches
 
-  Possible values: `true`, `false`
-
+   Only tracked branches can be successfully deleted on the remote. A warning will be printed if any untracked branches on the remote correspond to missing local branches.
 * `--allow-empty-description` — Allow pushing commits with empty descriptions
-
-  Possible values: `true`, `false`
-
 * `-r`, `--revisions <REVISIONS>` — Push branches pointing to these commits (can be repeated)
 * `-c`, `--change <CHANGE>` — Push this commit by creating a branch based on its change ID (can be repeated)
 * `--dry-run` — Only display what will change on the remote
 
-  Possible values: `true`, `false`
 
 
+## `jj git remote`
 
+Manage Git remotes
 
-## `jj git import`
+The Git repo will be a bare git repo stored inside the `.jj/` directory.
 
-Update repo with changes made in the underlying Git repo
+**Usage:** `jj git remote <COMMAND>`
 
-If a working-copy commit gets abandoned, it will be given a new, empty commit. This is true in general; it is not specific to this command.
+###### **Subcommands:**
 
-**Usage:** `jj git import`
+* `add` — Add a Git remote
+* `list` — List Git remotes
+* `remove` — Remove a Git remote and forget its branches
+* `rename` — Rename a Git remote
+* `set-url` — Set the URL of a Git remote
 
 
 
-## `jj git export`
+## `jj git remote add`
 
-Update the underlying Git repo with changes made in the repo
+Add a Git remote
 
-**Usage:** `jj git export`
+**Usage:** `jj git remote add <REMOTE> <URL>`
+
+###### **Arguments:**
+
+* `<REMOTE>` — The remote's name
+* `<URL>` — The remote's URL
+
+
+
+## `jj git remote list`
+
+List Git remotes
+
+**Usage:** `jj git remote list`
+
+
+
+## `jj git remote remove`
+
+Remove a Git remote and forget its branches
+
+**Usage:** `jj git remote remove <REMOTE>`
+
+###### **Arguments:**
+
+* `<REMOTE>` — The remote's name
+
+
+
+## `jj git remote rename`
+
+Rename a Git remote
+
+**Usage:** `jj git remote rename <OLD> <NEW>`
+
+###### **Arguments:**
+
+* `<OLD>` — The name of an existing remote
+* `<NEW>` — The desired name for `old`
+
+
+
+## `jj git remote set-url`
+
+Set the URL of a Git remote
+
+**Usage:** `jj git remote set-url <REMOTE> <URL>`
+
+###### **Arguments:**
+
+* `<REMOTE>` — The remote's name
+* `<URL>` — The desired url for `remote`
 
 
 
@@ -1025,14 +1033,6 @@ If the given directory does not exist, it will be created. If no directory is gi
 
   Default value: `.`
 
-###### **Options:**
-
-* `--git` — DEPRECATED: Use `jj git init` Use the Git backend, creating a jj repo backed by a Git repo
-
-  Possible values: `true`, `false`
-
-* `--git-repo <GIT_REPO>` — DEPRECATED: Use `jj git init` Path to a git repo the jj repo will be backed by
-
 
 
 ## `jj interdiff`
@@ -1052,25 +1052,15 @@ This excludes changes from other commits by temporarily rebasing `--from` onto `
 * `--from <FROM>` — Show changes from this revision
 * `--to <TO>` — Show changes to this revision
 * `-s`, `--summary` — For each path, show only whether it was modified, added, or deleted
-
-  Possible values: `true`, `false`
-
 * `--stat` — Show a histogram of the changes
-
-  Possible values: `true`, `false`
-
 * `--types` — For each path, show only its type before and after
 
-  Possible values: `true`, `false`
+   The diff is shown as two letters. The first letter indicates the type before and the second letter indicates the type after. '-' indicates that the path was not present, 'F' represents a regular file, `L' represents a symlink, 'C' represents a conflict, and 'G' represents a Git submodule.
+* `--name-only` — For each path, show only its path
 
+   Typically useful for shell commands like: `jj diff -r @- --name_only | xargs perl -pi -e's/OLD/NEW/g`
 * `--git` — Show a Git-format diff
-
-  Possible values: `true`, `false`
-
 * `--color-words` — Show a word-level diff with changes indicated only by color
-
-  Possible values: `true`, `false`
-
 * `--tool <TOOL>` — Generate diff by external command
 * `--context <CONTEXT>` — Number of lines of context to show
 
@@ -1094,39 +1084,24 @@ Spans of revisions that are not included in the graph per `--revisions` are rend
 
 * `-r`, `--revisions <REVISIONS>` — Which revisions to show. If no paths nor revisions are specified, this defaults to the `revsets.log` setting, or `@ | ancestors(immutable_heads().., 2) | trunk()` if it is not set
 * `--reversed` — Show revisions in the opposite order (older revisions first)
+* `-n`, `--limit <LIMIT>` — Limit number of revisions to show
 
-  Possible values: `true`, `false`
-
-* `-l`, `--limit <LIMIT>` — Limit number of revisions to show
+   Applied after revisions are filtered and reordered.
 * `--no-graph` — Don't show the graph, show a flat list of revisions
-
-  Possible values: `true`, `false`
-
 * `-T`, `--template <TEMPLATE>` — Render each revision using the given template
-* `-p`, `--patch` — Show patch
-
-  Possible values: `true`, `false`
 
+   For the syntax, see https://github.com/martinvonz/jj/blob/main/docs/templates.md
+* `-p`, `--patch` — Show patch
 * `-s`, `--summary` — For each path, show only whether it was modified, added, or deleted
-
-  Possible values: `true`, `false`
-
 * `--stat` — Show a histogram of the changes
-
-  Possible values: `true`, `false`
-
 * `--types` — For each path, show only its type before and after
 
-  Possible values: `true`, `false`
+   The diff is shown as two letters. The first letter indicates the type before and the second letter indicates the type after. '-' indicates that the path was not present, 'F' represents a regular file, `L' represents a symlink, 'C' represents a conflict, and 'G' represents a Git submodule.
+* `--name-only` — For each path, show only its path
 
+   Typically useful for shell commands like: `jj diff -r @- --name_only | xargs perl -pi -e's/OLD/NEW/g`
 * `--git` — Show a Git-format diff
-
-  Possible values: `true`, `false`
-
 * `--color-words` — Show a word-level diff with changes indicated only by color
-
-  Possible values: `true`, `false`
-
 * `--tool <TOOL>` — Generate diff by external command
 * `--context <CONTEXT>` — Number of lines of context to show
 
@@ -1152,20 +1127,8 @@ For more information, see https://github.com/martinvonz/jj/blob/main/docs/workin
 
 ###### **Options:**
 
-* `-r` — Ignored (but lets you pass `-r` for consistency with other commands)
 * `-m`, `--message <MESSAGE>` — The change description to use
-* `-L`, `--allow-large-revsets` — Deprecated. Please prefix the revset with `all:` instead
-
-  Possible values: `true`, `false`
-
 * `--no-edit` — Do not edit the newly created change
-
-  Possible values: `true`, `false`
-
-* `--edit` — No-op flag to pair with --no-edit
-
-  Possible values: `true`, `false`
-
 * `-A`, `--insert-after <INSERT_AFTER>` — Insert the new change after the given commit(s)
 * `-B`, `--insert-before <INSERT_BEFORE>` — Insert the new change before the given commit(s)
 
@@ -1215,9 +1178,7 @@ implied.
 ###### **Options:**
 
 * `-e`, `--edit` — Instead of creating a new working-copy commit on top of the target commit (like `jj new`), edit the target commit directly (like `jj edit`)
-
-  Possible values: `true`, `false`
-
+* `--conflict` — Jump to the next conflicted descendant
 
 
 
@@ -1236,36 +1197,24 @@ Name is derived from Merciual's obsolescence markers.
 * `-r`, `--revision <REVISION>`
 
   Default value: `@`
-* `-l`, `--limit <LIMIT>` — Limit number of revisions to show
+* `-n`, `--limit <LIMIT>` — Limit number of revisions to show
 * `--no-graph` — Don't show the graph, show a flat list of revisions
-
-  Possible values: `true`, `false`
-
 * `-T`, `--template <TEMPLATE>` — Render each revision using the given template
-* `-p`, `--patch` — Show patch compared to the previous version of this change
 
-  Possible values: `true`, `false`
+   For the syntax, see https://github.com/martinvonz/jj/blob/main/docs/templates.md
+* `-p`, `--patch` — Show patch compared to the previous version of this change
 
+   If the previous version has different parents, it will be temporarily rebased to the parents of the new version, so the diff is not contaminated by unrelated changes.
 * `-s`, `--summary` — For each path, show only whether it was modified, added, or deleted
-
-  Possible values: `true`, `false`
-
 * `--stat` — Show a histogram of the changes
-
-  Possible values: `true`, `false`
-
 * `--types` — For each path, show only its type before and after
 
-  Possible values: `true`, `false`
+   The diff is shown as two letters. The first letter indicates the type before and the second letter indicates the type after. '-' indicates that the path was not present, 'F' represents a regular file, `L' represents a symlink, 'C' represents a conflict, and 'G' represents a Git submodule.
+* `--name-only` — For each path, show only its path
 
+   Typically useful for shell commands like: `jj diff -r @- --name_only | xargs perl -pi -e's/OLD/NEW/g`
 * `--git` — Show a Git-format diff
-
-  Possible values: `true`, `false`
-
 * `--color-words` — Show a word-level diff with changes indicated only by color
-
-  Possible values: `true`, `false`
-
 * `--tool <TOOL>` — Generate diff by external command
 * `--context <CONTEXT>` — Number of lines of context to show
 
@@ -1283,8 +1232,8 @@ For information about the operation log, see https://github.com/martinvonz/jj/bl
 
 * `abandon` — Abandon operation history
 * `log` — Show the operation log
-* `undo` — Create a new operation that undoes an earlier operation
 * `restore` — Create a new operation that restores the repo to an earlier state
+* `undo` — Create a new operation that undoes an earlier operation
 
 
 
@@ -1314,33 +1263,34 @@ Show the operation log
 
 ###### **Options:**
 
-* `-l`, `--limit <LIMIT>` — Limit number of operations to show
+* `-n`, `--limit <LIMIT>` — Limit number of operations to show
 * `--no-graph` — Don't show the graph, show a flat list of operations
-
-  Possible values: `true`, `false`
-
 * `-T`, `--template <TEMPLATE>` — Render each operation using the given template
 
+   For the syntax, see https://github.com/martinvonz/jj/blob/main/docs/templates.md
 
 
-## `jj operation undo`
 
-Create a new operation that undoes an earlier operation
+## `jj operation restore`
 
-This undoes an individual operation by applying the inverse of the operation.
+Create a new operation that restores the repo to an earlier state
 
-**Usage:** `jj operation undo [OPTIONS] [OPERATION]`
+This restores the repo to the state at the specified operation, effectively undoing all later operations. It does so by creating a new operation.
+
+**Usage:** `jj operation restore [OPTIONS] <OPERATION>`
 
 ###### **Arguments:**
 
-* `<OPERATION>` — The operation to undo
+* `<OPERATION>` — The operation to restore to
 
-  Default value: `@`
+   Use `jj op log` to find an operation to restore to. Use e.g. `jj --at-op=<operation ID> log` before restoring to an operation to see the state of the repo at that operation.
 
 ###### **Options:**
 
 * `--what <WHAT>` — What portions of the local state to restore (can be repeated)
 
+   This option is EXPERIMENTAL.
+
   Default values: `repo`, `remote-tracking`
 
   Possible values:
@@ -1352,22 +1302,28 @@ This undoes an individual operation by applying the inverse of the operation.
 
 
 
-## `jj operation restore`
+## `jj operation undo`
 
-Create a new operation that restores the repo to an earlier state
+Create a new operation that undoes an earlier operation
 
-This restores the repo to the state at the specified operation, effectively undoing all later operations. It does so by creating a new operation.
+This undoes an individual operation by applying the inverse of the operation.
 
-**Usage:** `jj operation restore [OPTIONS] <OPERATION>`
+**Usage:** `jj operation undo [OPTIONS] [OPERATION]`
 
 ###### **Arguments:**
 
-* `<OPERATION>` — The operation to restore to
+* `<OPERATION>` — The operation to undo
+
+   Use `jj op log` to find an operation to undo.
+
+  Default value: `@`
 
 ###### **Options:**
 
 * `--what <WHAT>` — What portions of the local state to restore (can be repeated)
 
+   This option is EXPERIMENTAL.
+
   Default values: `repo`, `remote-tracking`
 
   Possible values:
@@ -1459,9 +1415,7 @@ implied.
 ###### **Options:**
 
 * `-e`, `--edit` — Edit the parent directly, instead of moving the working-copy commit
-
-  Possible values: `true`, `false`
-
+* `--conflict` — Jump to the previous conflicted ancestor
 
 
 
@@ -1558,19 +1512,28 @@ commit. This is true in general; it is not specific to this command.
 ###### **Options:**
 
 * `-b`, `--branch <BRANCH>` — Rebase the whole branch relative to destination's ancestors (can be repeated)
+
+   `jj rebase -b=br -d=dst` is equivalent to `jj rebase '-s=roots(dst..br)' -d=dst`.
+
+   If none of `-b`, `-s`, or `-r` is provided, then the default is `-b @`.
 * `-s`, `--source <SOURCE>` — Rebase specified revision(s) together with their trees of descendants (can be repeated)
+
+   Each specified revision will become a direct child of the destination revision(s), even if some of the source revisions are descendants of others.
+
+   If none of `-b`, `-s`, or `-r` is provided, then the default is `-b @`.
 * `-r`, `--revisions <REVISIONS>` — Rebase the given revisions, rebasing descendants onto this revision's parent(s)
-* `-d`, `--destination <DESTINATION>` — The revision(s) to rebase onto (can be repeated to create a merge commit)
-* `-A`, `--insert-after <INSERT_AFTER>` — The revision(s) to insert after (can be repeated to create a merge commit)
-* `-B`, `--insert-before <INSERT_BEFORE>` — The revision(s) to insert before (can be repeated to create a merge commit)
-* `--skip-empty` — If true, when rebasing would produce an empty commit, the commit is abandoned. It will not be abandoned if it was already empty before the rebase. Will never skip merge commits with multiple non-empty parents
 
-  Possible values: `true`, `false`
+   Unlike `-s` or `-b`, you may `jj rebase -r` a revision `A` onto a descendant of `A`.
 
-* `-L`, `--allow-large-revsets` — Deprecated. Please prefix the revset with `all:` instead
+   If none of `-b`, `-s`, or `-r` is provided, then the default is `-b @`.
+* `-d`, `--destination <DESTINATION>` — The revision(s) to rebase onto (can be repeated to create a merge commit)
+* `-A`, `--insert-after <INSERT_AFTER>` — The revision(s) to insert after (can be repeated to create a merge commit)
 
-  Possible values: `true`, `false`
+   Only works with `-r`.
+* `-B`, `--insert-before <INSERT_BEFORE>` — The revision(s) to insert before (can be repeated to create a merge commit)
 
+   Only works with `-r`.
+* `--skip-empty` — If true, when rebasing would produce an empty commit, the commit is abandoned. It will not be abandoned if it was already empty before the rebase. Will never skip merge commits with multiple non-empty parents
 
 
 
@@ -1594,9 +1557,6 @@ Note that conflicts can also be resolved without using this command. You may edi
 
   Default value: `@`
 * `-l`, `--list` — Instead of resolving one conflict, list all the conflicts
-
-  Possible values: `true`, `false`
-
 * `--tool <NAME>` — Specify 3-way merge tool to be used
 
 
@@ -1623,8 +1583,11 @@ See `jj diffedit` if you'd like to restore portions of files rather than entire
 
 * `--from <FROM>` — Revision to restore from (source)
 * `--to <TO>` — Revision to restore into (destination)
-* `-c`, `--changes-in <REVISION>` — Undo the changes in a revision as compared to the merge of its parents
-* `-r`, `--revision <REVISION>` — Prints an error. DO NOT USE
+* `-c`, `--changes-in <REVISION>` — Undo the changes in a revision as compared to the merge of its parents.
+
+   This undoes the changes that can be seen with `jj diff -r REVISION`. If `REVISION` only has a single parent, this option is equivalent to `jj restore --to REVISION --from REVISION-`.
+
+   The default behavior of `jj restore` is equivalent to `jj restore --changes-in @`.
 
 
 
@@ -1650,31 +1613,19 @@ Show commit description and changes in a revision
 
 ###### **Options:**
 
-* `-r` — Ignored (but lets you pass `-r` for consistency with other commands)
-
-  Possible values: `true`, `false`
-
 * `-T`, `--template <TEMPLATE>` — Render a revision using the given template
-* `-s`, `--summary` — For each path, show only whether it was modified, added, or deleted
-
-  Possible values: `true`, `false`
 
+   For the syntax, see https://github.com/martinvonz/jj/blob/main/docs/templates.md
+* `-s`, `--summary` — For each path, show only whether it was modified, added, or deleted
 * `--stat` — Show a histogram of the changes
-
-  Possible values: `true`, `false`
-
 * `--types` — For each path, show only its type before and after
 
-  Possible values: `true`, `false`
+   The diff is shown as two letters. The first letter indicates the type before and the second letter indicates the type after. '-' indicates that the path was not present, 'F' represents a regular file, `L' represents a symlink, 'C' represents a conflict, and 'G' represents a Git submodule.
+* `--name-only` — For each path, show only its path
 
+   Typically useful for shell commands like: `jj diff -r @- --name_only | xargs perl -pi -e's/OLD/NEW/g`
 * `--git` — Show a Git-format diff
-
-  Possible values: `true`, `false`
-
 * `--color-words` — Show a word-level diff with changes indicated only by color
-
-  Possible values: `true`, `false`
-
 * `--tool <TOOL>` — Generate diff by external command
 * `--context <CONTEXT>` — Number of lines of context to show
 
@@ -1688,10 +1639,18 @@ Manage which paths from the working-copy commit are present in the working copy
 
 ###### **Subcommands:**
 
+* `edit` — Start an editor to update the patterns that are present in the working copy
 * `list` — List the patterns that are currently present in the working copy
-* `set` — Update the patterns that are present in the working copy
 * `reset` — Reset the patterns to include all files in the working copy
-* `edit` — Start an editor to update the patterns that are present in the working copy
+* `set` — Update the patterns that are present in the working copy
+
+
+
+## `jj sparse edit`
+
+Start an editor to update the patterns that are present in the working copy
+
+**Usage:** `jj sparse edit`
 
 
 
@@ -1705,6 +1664,14 @@ By default, a newly cloned or initialized repo will have have a pattern matching
 
 
 
+## `jj sparse reset`
+
+Reset the patterns to include all files in the working copy
+
+**Usage:** `jj sparse reset`
+
+
+
 ## `jj sparse set`
 
 Update the patterns that are present in the working copy
@@ -1719,25 +1686,6 @@ For example, if all you need is the `README.md` and the `lib/` directory, use `j
 * `--remove <REMOVE>` — Patterns to remove from the working copy
 * `--clear` — Include no files in the working copy (combine with --add)
 
-  Possible values: `true`, `false`
-
-
-
-
-## `jj sparse reset`
-
-Reset the patterns to include all files in the working copy
-
-**Usage:** `jj sparse reset`
-
-
-
-## `jj sparse edit`
-
-Start an editor to update the patterns that are present in the working copy
-
-**Usage:** `jj sparse edit`
-
 
 
 ## `jj split`
@@ -1761,17 +1709,11 @@ Splitting an empty commit is not supported because the same effect can be achiev
 ###### **Options:**
 
 * `-i`, `--interactive` — Interactively choose which parts to split. This is the default if no paths are provided
-
-  Possible values: `true`, `false`
-
 * `--tool <NAME>` — Specify diff editor to be used (implies --interactive)
 * `-r`, `--revision <REVISION>` — The revision to split
 
   Default value: `@`
-* `-s`, `--siblings` — Split the revision into two siblings instead of a parent and child
-
-  Possible values: `true`, `false`
-
+* `-p`, `--parallel` — Split the revision into two parallel revisions instead of a parent and child
 
 
 
@@ -1802,13 +1744,7 @@ If a working-copy commit gets abandoned, it will be given a new, empty commit. T
 * `--into <INTO>` — Revision to squash into (default: @)
 * `-m`, `--message <MESSAGE>` — The description to use for squashed revision (don't open editor)
 * `-u`, `--use-destination-message` — Use the description of the destination revision and discard the description(s) of the source revision(s)
-
-  Possible values: `true`, `false`
-
 * `-i`, `--interactive` — Interactively choose which parts to squash
-
-  Possible values: `true`, `false`
-
 * `--tool <NAME>` — Specify diff editor to be used (implies --interactive)
 
 
@@ -1853,10 +1789,16 @@ List tags
 
 * `<NAMES>` — Show tags whose local name matches
 
+   By default, the specified name matches exactly. Use `glob:` prefix to select tags by wildcard pattern. For details, see https://github.com/martinvonz/jj/blob/main/docs/revsets.md#string-patterns.
+
 ###### **Options:**
 
 * `-T`, `--template <TEMPLATE>` — Render each tag using the given template
 
+   All 0-argument methods of the `RefName` type are available as keywords.
+
+   For the syntax, see https://github.com/martinvonz/jj/blob/main/docs/templates.md
+
 
 
 ## `jj util`
@@ -1904,21 +1846,6 @@ Apply it by running one of these:
   Possible values: `bash`, `elvish`, `fish`, `nushell`, `power-shell`, `zsh`
 
 
-###### **Options:**
-
-* `--bash` — Deprecated. Use the SHELL positional argument instead
-
-  Possible values: `true`, `false`
-
-* `--fish` — Deprecated. Use the SHELL positional argument instead
-
-  Possible values: `true`, `false`
-
-* `--zsh` — Deprecated. Use the SHELL positional argument instead
-
-  Possible values: `true`, `false`
-
-
 
 
 ## `jj util gc`
@@ -1931,6 +1858,10 @@ Run backend-dependent garbage collection
 
 * `--expire <EXPIRE>` — Time threshold
 
+   By default, only obsolete objects and operations older than 2 weeks are pruned.
+
+   Only the string "now" can be passed to this parameter. Support for arbitrary absolute and relative timestamps will come in a subsequent release.
+
 
 
 ## `jj util mangen`
@@ -1967,12 +1898,16 @@ Undo an operation (shortcut for `jj op undo`)
 
 * `<OPERATION>` — The operation to undo
 
+   Use `jj op log` to find an operation to undo.
+
   Default value: `@`
 
 ###### **Options:**
 
 * `--what <WHAT>` — What portions of the local state to restore (can be repeated)
 
+   This option is EXPERIMENTAL.
+
   Default values: `repo`, `remote-tracking`
 
   Possible values:
@@ -2002,9 +1937,6 @@ If a working-copy commit gets abandoned, it will be given a new, empty commit. T
 
   Default value: `@`
 * `-i`, `--interactive` — Interactively choose which parts to unsquash
-
-  Possible values: `true`, `false`
-
 * `--tool <NAME>` — Specify diff editor to be used (implies --interactive)
 
 
@@ -2017,7 +1949,9 @@ Stop tracking specified paths in the working copy
 
 ###### **Arguments:**
 
-* `<PATHS>` — Paths to untrack. They must already be ignored
+* `<PATHS>` — Paths to untrack. They must already be ignored.
+
+   The paths could be ignored via a .gitignore or .git/info/exclude (in colocated repos).
 
 
 
@@ -2066,7 +2000,13 @@ Sparse patterns will be copied over from the current workspace.
 ###### **Options:**
 
 * `--name <NAME>` — A name for the workspace
-* `-r`, `--revision <REVISION>` — A list of parent revisions for the working-copy commit of the newly created workspace. You may specify nothing, or any number of parents
+
+   To override the default, which is the basename of the destination directory.
+* `-r`, `--revision <REVISION>` — A list of parent revisions for the working-copy commit of the newly created workspace. You may specify nothing, or any number of parents.
+
+   If no revisions are specified, the new workspace will be created, and its working-copy commit will exist on top of the parent(s) of the working-copy commit in the current workspace, i.e. they will share the same parent(s).
+
+   If any revisions are specified, the new workspace will be created, and the new working-copy commit will be created with all these revisions as parents, i.e. the working-copy commit will exist as if you had run `jj new r1 r2 r3 ...`.
 
 
 
diff --git a/cli/tests/runner.rs b/cli/tests/runner.rs
index afa39c3773..c143db0975 100644
--- a/cli/tests/runner.rs
+++ b/cli/tests/runner.rs
@@ -14,9 +14,7 @@ mod test_advance_branches;
 mod test_alias;
 mod test_branch_command;
 mod test_builtin_aliases;
-mod test_cat_command;
 mod test_checkout;
-mod test_chmod_command;
 mod test_commit_command;
 mod test_commit_template;
 mod test_concurrent_operations;
@@ -27,6 +25,8 @@ mod test_diff_command;
 mod test_diffedit_command;
 mod test_duplicate_command;
 mod test_edit_command;
+mod test_file_chmod_command;
+mod test_file_print_command;
 mod test_fix_command;
 mod test_generate_md_cli_help;
 mod test_git_clone;
diff --git a/cli/tests/test_acls.rs b/cli/tests/test_acls.rs
index 8db8967bc9..dc72251c80 100644
--- a/cli/tests/test_acls.rs
+++ b/cli/tests/test_acls.rs
@@ -110,7 +110,7 @@ fn test_cat() {
 
     SecretBackend::adopt_git_repo(&repo_path);
 
-    let (stdout, stderr) = test_env.jj_cmd_ok(&repo_path, &["cat", "."]);
+    let (stdout, stderr) = test_env.jj_cmd_ok(&repo_path, &["file", "show", "."]);
     insta::assert_snapshot!(stdout.replace('\\', "/"), @r###"
     foo
     baz
diff --git a/cli/tests/test_alias.rs b/cli/tests/test_alias.rs
index b542a81942..e24b7d1063 100644
--- a/cli/tests/test_alias.rs
+++ b/cli/tests/test_alias.rs
@@ -316,8 +316,10 @@ fn test_alias_in_repo_config() {
     "###);
 
     // No warning if the expanded command is identical.
-    let (stdout, stderr) =
-        test_env.jj_cmd_ok(&repo1_path, &["files", "-R", repo2_path.to_str().unwrap()]);
+    let (stdout, stderr) = test_env.jj_cmd_ok(
+        &repo1_path,
+        &["file", "list", "-R", repo2_path.to_str().unwrap()],
+    );
     insta::assert_snapshot!(stdout, @"");
     insta::assert_snapshot!(stderr, @"");
 
diff --git a/cli/tests/test_branch_command.rs b/cli/tests/test_branch_command.rs
index fb13919981..34ee9b068d 100644
--- a/cli/tests/test_branch_command.rs
+++ b/cli/tests/test_branch_command.rs
@@ -88,6 +88,13 @@ fn test_branch_empty_name() {
 
     For more information, try '--help'.
     "###);
+
+    let stderr = test_env.jj_cmd_cli_error(&repo_path, &["branch", "set", ""]);
+    insta::assert_snapshot!(stderr, @r###"
+    error: a value is required for '<NAMES>...' but none was supplied
+
+    For more information, try '--help'.
+    "###);
 }
 
 #[test]
@@ -96,14 +103,24 @@ fn test_branch_move() {
     test_env.jj_cmd_ok(test_env.env_root(), &["git", "init", "repo"]);
     let repo_path = test_env.env_root().join("repo");
 
-    let stderr = test_env.jj_cmd_failure(&repo_path, &["branch", "set", "foo"]);
+    // Set up remote
+    let git_repo_path = test_env.env_root().join("git-repo");
+    git2::Repository::init_bare(git_repo_path).unwrap();
+    test_env.jj_cmd_ok(
+        &repo_path,
+        &["git", "remote", "add", "origin", "../git-repo"],
+    );
+
+    let stderr = test_env.jj_cmd_failure(&repo_path, &["branch", "move", "foo"]);
     insta::assert_snapshot!(stderr, @r###"
     Error: No such branch: foo
-    Hint: Use `jj branch create` to create it.
     "###);
 
-    let (_stdout, stderr) = test_env.jj_cmd_ok(&repo_path, &["branch", "create", "foo"]);
-    insta::assert_snapshot!(stderr, @"");
+    let (_stdout, stderr) = test_env.jj_cmd_ok(&repo_path, &["branch", "set", "foo"]);
+    insta::assert_snapshot!(stderr, @r###"
+    Created branches: foo
+    Hint: Consider using `jj branch move` if your intention was to move existing branches.
+    "###);
 
     test_env.jj_cmd_ok(&repo_path, &["new"]);
     let stderr = test_env.jj_cmd_failure(&repo_path, &["branch", "create", "foo"]);
@@ -126,6 +143,158 @@ fn test_branch_move() {
         &["branch", "set", "-r@-", "--allow-backwards", "foo"],
     );
     insta::assert_snapshot!(stderr, @"");
+
+    let (_stdout, stderr) = test_env.jj_cmd_ok(&repo_path, &["branch", "move", "foo"]);
+    insta::assert_snapshot!(stderr, @"");
+
+    let stderr = test_env.jj_cmd_failure(&repo_path, &["branch", "move", "--to=@-", "foo"]);
+    insta::assert_snapshot!(stderr, @r###"
+    Error: Refusing to move branch backwards or sideways: foo
+    Hint: Use --allow-backwards to allow it.
+    "###);
+
+    let (_stdout, stderr) = test_env.jj_cmd_ok(
+        &repo_path,
+        &["branch", "move", "--to=@-", "--allow-backwards", "foo"],
+    );
+    insta::assert_snapshot!(stderr, @"");
+
+    // Delete branch locally, but is still tracking remote
+    test_env.jj_cmd_ok(&repo_path, &["describe", "@-", "-mcommit"]);
+    test_env.jj_cmd_ok(&repo_path, &["git", "push", "-r@-"]);
+    test_env.jj_cmd_ok(&repo_path, &["branch", "delete", "foo"]);
+    insta::assert_snapshot!(get_branch_output(&test_env, &repo_path), @r###"
+    foo (deleted)
+      @origin: qpvuntsm 29a62310 (empty) commit
+    "###);
+
+    // Deleted tracking branch name should still be allocated
+    let stderr = test_env.jj_cmd_failure(&repo_path, &["branch", "create", "foo"]);
+    insta::assert_snapshot!(stderr, @r###"
+    Error: Tracked remote branches exist for deleted branch: foo
+    Hint: Use `jj branch set` to recreate the local branch. Run `jj branch untrack 'glob:foo@*'` to disassociate them.
+    "###);
+
+    // Restoring local target shouldn't invalidate tracking state
+    let (_stdout, stderr) = test_env.jj_cmd_ok(&repo_path, &["branch", "set", "foo"]);
+    insta::assert_snapshot!(stderr, @"");
+    insta::assert_snapshot!(get_branch_output(&test_env, &repo_path), @r###"
+    foo: mzvwutvl d5f17aba (empty) (no description set)
+      @origin (behind by 1 commits): qpvuntsm 29a62310 (empty) commit
+    "###);
+
+    // Untracked remote branch shouldn't block creation of local branch
+    test_env.jj_cmd_ok(&repo_path, &["branch", "untrack", "foo@origin"]);
+    test_env.jj_cmd_ok(&repo_path, &["branch", "delete", "foo"]);
+    let (_stdout, stderr) = test_env.jj_cmd_ok(&repo_path, &["branch", "create", "foo"]);
+    insta::assert_snapshot!(stderr, @"");
+    insta::assert_snapshot!(get_branch_output(&test_env, &repo_path), @r###"
+    foo: mzvwutvl d5f17aba (empty) (no description set)
+    foo@origin: qpvuntsm 29a62310 (empty) commit
+    "###);
+}
+
+#[test]
+fn test_branch_move_matching() {
+    let test_env = TestEnvironment::default();
+    test_env.jj_cmd_ok(test_env.env_root(), &["git", "init", "repo"]);
+    let repo_path = test_env.env_root().join("repo");
+
+    test_env.jj_cmd_ok(&repo_path, &["branch", "create", "a1", "a2"]);
+    test_env.jj_cmd_ok(&repo_path, &["new", "-mhead1"]);
+    test_env.jj_cmd_ok(&repo_path, &["new", "root()"]);
+    test_env.jj_cmd_ok(&repo_path, &["branch", "create", "b1"]);
+    test_env.jj_cmd_ok(&repo_path, &["new"]);
+    test_env.jj_cmd_ok(&repo_path, &["branch", "create", "c1"]);
+    test_env.jj_cmd_ok(&repo_path, &["new", "-mhead2"]);
+    insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###"
+    @   a2781dd9ee37
+    ◉  c1 f4f38657a3dd
+    ◉  b1 f652c32197cf
+    │ ◉   6b5e840ea72b
+    │ ◉  a1 a2 230dd059e1b0
+    ├─╯
+    ◉   000000000000
+    "###);
+
+    // The default could be considered "--from=all() glob:*", but is disabled
+    let stderr = test_env.jj_cmd_cli_error(&repo_path, &["branch", "move"]);
+    insta::assert_snapshot!(stderr, @r###"
+    error: the following required arguments were not provided:
+      <--from <REVISIONS>|NAMES>
+
+    Usage: jj branch move <--from <REVISIONS>|NAMES>
+
+    For more information, try '--help'.
+    "###);
+
+    // No branches pointing to the source revisions
+    let (_stdout, stderr) = test_env.jj_cmd_ok(&repo_path, &["branch", "move", "--from=none()"]);
+    insta::assert_snapshot!(stderr, @r###"
+    No branches to update.
+    "###);
+
+    // No matching branches within the source revisions
+    let stderr = test_env.jj_cmd_failure(&repo_path, &["branch", "move", "--from=::@", "glob:a?"]);
+    insta::assert_snapshot!(stderr, @r###"
+    Error: No matching branches for patterns: a?
+    "###);
+
+    // Noop move
+    let (_stdout, stderr) = test_env.jj_cmd_ok(&repo_path, &["branch", "move", "--to=a1", "a2"]);
+    insta::assert_snapshot!(stderr, @r###"
+    Nothing changed.
+    "###);
+
+    // Move from multiple revisions
+    let (_stdout, stderr) = test_env.jj_cmd_ok(&repo_path, &["branch", "move", "--from=::@"]);
+    insta::assert_snapshot!(stderr, @r###"
+    Warning: Updating multiple branches: b1, c1
+    Hint: Specify branch by name to update one.
+    "###);
+    insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###"
+    @  b1 c1 a2781dd9ee37
+    ◉   f4f38657a3dd
+    ◉   f652c32197cf
+    │ ◉   6b5e840ea72b
+    │ ◉  a1 a2 230dd059e1b0
+    ├─╯
+    ◉   000000000000
+    "###);
+    test_env.jj_cmd_ok(&repo_path, &["undo"]);
+
+    // Try to move multiple branches, but one of them isn't fast-forward
+    let stderr = test_env.jj_cmd_failure(&repo_path, &["branch", "move", "glob:?1"]);
+    insta::assert_snapshot!(stderr, @r###"
+    Warning: Updating multiple branches: a1, b1, c1
+    Error: Refusing to move branch backwards or sideways: a1
+    Hint: Use --allow-backwards to allow it.
+    "###);
+    insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###"
+    @   a2781dd9ee37
+    ◉  c1 f4f38657a3dd
+    ◉  b1 f652c32197cf
+    │ ◉   6b5e840ea72b
+    │ ◉  a1 a2 230dd059e1b0
+    ├─╯
+    ◉   000000000000
+    "###);
+
+    // Select by revision and name
+    let (_stdout, stderr) = test_env.jj_cmd_ok(
+        &repo_path,
+        &["branch", "move", "--from=::a1+", "--to=a1+", "glob:?1"],
+    );
+    insta::assert_snapshot!(stderr, @"");
+    insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###"
+    @   a2781dd9ee37
+    ◉  c1 f4f38657a3dd
+    ◉  b1 f652c32197cf
+    │ ◉  a1 6b5e840ea72b
+    │ ◉  a2 230dd059e1b0
+    ├─╯
+    ◉   000000000000
+    "###);
 }
 
 #[test]
@@ -227,8 +396,14 @@ fn test_branch_rename() {
     let (_stdout, stderr) =
         test_env.jj_cmd_ok(&repo_path, &["branch", "rename", "bremote", "bremote2"]);
     insta::assert_snapshot!(stderr, @r###"
-    Warning: Branch bremote has tracking remote branches which were not renamed.
-    Hint: to rename the branch on the remote, you can `jj git push --branch bremote` first (to delete it on the remote), and then `jj git push --branch bremote2`. `jj git push --all` would also be sufficient.
+    Warning: Tracked remote branches for branch bremote were not renamed.
+    Hint: To rename the branch on the remote, you can `jj git push --branch bremote` first (to delete it on the remote), and then `jj git push --branch bremote2`. `jj git push --all` would also be sufficient.
+    "###);
+    let (_stdout, stderr) =
+        test_env.jj_cmd_ok(&repo_path, &["branch", "rename", "bremote2", "bremote"]);
+    insta::assert_snapshot!(stderr, @r###"
+    Warning: Tracked remote branches for branch bremote exist.
+    Hint: Run `jj branch untrack 'glob:bremote@*'` to disassociate them.
     "###);
 }
 
@@ -247,11 +422,9 @@ fn test_branch_forget_glob() {
     @  bar-2 foo-1 foo-3 foo-4 230dd059e1b0
     ◉   000000000000
     "###);
-    let (stdout, stderr) =
-        test_env.jj_cmd_ok(&repo_path, &["branch", "forget", "--glob", "foo-[1-3]"]);
+    let (stdout, stderr) = test_env.jj_cmd_ok(&repo_path, &["branch", "forget", "glob:foo-[1-3]"]);
     insta::assert_snapshot!(stdout, @"");
     insta::assert_snapshot!(stderr, @r###"
-    Warning: --glob has been deprecated. Please prefix the pattern with `glob:` instead.
     Forgot 2 branches.
     "###);
     test_env.jj_cmd_ok(&repo_path, &["undo"]);
@@ -269,12 +442,10 @@ fn test_branch_forget_glob() {
     // multiple glob patterns, shouldn't produce an error.
     let (stdout, stderr) = test_env.jj_cmd_ok(
         &repo_path,
-        &["branch", "forget", "foo-4", "--glob", "foo-*", "glob:foo-*"],
+        &["branch", "forget", "foo-4", "glob:foo-*", "glob:foo-*"],
     );
     insta::assert_snapshot!(stdout, @"");
-    insta::assert_snapshot!(stderr, @r###"
-    Warning: --glob has been deprecated. Please prefix the pattern with `glob:` instead.
-    "###);
+    insta::assert_snapshot!(stderr, @"");
     insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###"
     @  bar-2 230dd059e1b0
     ◉   000000000000
@@ -283,7 +454,7 @@ fn test_branch_forget_glob() {
     // Malformed glob
     let stderr = test_env.jj_cmd_cli_error(&repo_path, &["branch", "forget", "glob:foo-[1-3"]);
     insta::assert_snapshot!(stderr, @r###"
-    error: invalid value 'glob:foo-[1-3' for '[NAMES]...': Pattern syntax error near position 4: invalid range pattern
+    error: invalid value 'glob:foo-[1-3' for '<NAMES>...': Pattern syntax error near position 4: invalid range pattern
 
     For more information, try '--help'.
     "###);
@@ -291,10 +462,9 @@ fn test_branch_forget_glob() {
     // We get an error if none of the globs match anything
     let stderr = test_env.jj_cmd_failure(
         &repo_path,
-        &["branch", "forget", "glob:bar*", "glob:baz*", "--glob=boom*"],
+        &["branch", "forget", "glob:bar*", "glob:baz*", "glob:boom*"],
     );
     insta::assert_snapshot!(stderr, @r###"
-    Warning: --glob has been deprecated. Please prefix the pattern with `glob:` instead.
     Error: No matching branches for patterns: baz*, boom*
     "###);
 }
@@ -329,11 +499,9 @@ fn test_branch_delete_glob() {
     @  bar-2 foo-1 foo-3 foo-4 6fbf398c2d59
     ◉   000000000000
     "###);
-    let (stdout, stderr) =
-        test_env.jj_cmd_ok(&repo_path, &["branch", "delete", "--glob", "foo-[1-3]"]);
+    let (stdout, stderr) = test_env.jj_cmd_ok(&repo_path, &["branch", "delete", "glob:foo-[1-3]"]);
     insta::assert_snapshot!(stdout, @"");
     insta::assert_snapshot!(stderr, @r###"
-    Warning: --glob has been deprecated. Please prefix the pattern with `glob:` instead.
     Deleted 2 branches.
     "###);
     test_env.jj_cmd_ok(&repo_path, &["undo"]);
@@ -349,9 +517,8 @@ fn test_branch_delete_glob() {
 
     // We get an error if none of the globs match live branches. Unlike `jj branch
     // forget`, it's not allowed to delete already deleted branches.
-    let stderr = test_env.jj_cmd_failure(&repo_path, &["branch", "delete", "--glob=foo-[1-3]"]);
+    let stderr = test_env.jj_cmd_failure(&repo_path, &["branch", "delete", "glob:foo-[1-3]"]);
     insta::assert_snapshot!(stderr, @r###"
-    Warning: --glob has been deprecated. Please prefix the pattern with `glob:` instead.
     Error: No matching branches for patterns: foo-[1-3]
     "###);
 
@@ -359,12 +526,10 @@ fn test_branch_delete_glob() {
     // multiple glob patterns, shouldn't produce an error.
     let (stdout, stderr) = test_env.jj_cmd_ok(
         &repo_path,
-        &["branch", "delete", "foo-4", "--glob", "foo-*", "glob:foo-*"],
+        &["branch", "delete", "foo-4", "glob:foo-*", "glob:foo-*"],
     );
     insta::assert_snapshot!(stdout, @"");
-    insta::assert_snapshot!(stderr, @r###"
-    Warning: --glob has been deprecated. Please prefix the pattern with `glob:` instead.
-    "###);
+    insta::assert_snapshot!(stderr, @"");
     insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###"
     @  bar-2 foo-1@origin foo-3@origin foo-4@origin 6fbf398c2d59
     ◉   000000000000
@@ -385,7 +550,7 @@ fn test_branch_delete_glob() {
     // Malformed glob
     let stderr = test_env.jj_cmd_cli_error(&repo_path, &["branch", "delete", "glob:foo-[1-3"]);
     insta::assert_snapshot!(stderr, @r###"
-    error: invalid value 'glob:foo-[1-3' for '[NAMES]...': Pattern syntax error near position 4: invalid range pattern
+    error: invalid value 'glob:foo-[1-3' for '<NAMES>...': Pattern syntax error near position 4: invalid range pattern
 
     For more information, try '--help'.
     "###);
@@ -393,7 +558,7 @@ fn test_branch_delete_glob() {
     // Unknown pattern kind
     let stderr = test_env.jj_cmd_cli_error(&repo_path, &["branch", "forget", "whatever:branch"]);
     insta::assert_snapshot!(stderr, @r###"
-    error: invalid value 'whatever:branch' for '[NAMES]...': Invalid string pattern kind "whatever:"
+    error: invalid value 'whatever:branch' for '<NAMES>...': Invalid string pattern kind "whatever:"
 
     For more information, try '--help'.
     Hint: Try prefixing with one of `exact:`, `glob:` or `substring:`
diff --git a/cli/tests/test_diff_command.rs b/cli/tests/test_diff_command.rs
index 0764fc3932..a146b7d75d 100644
--- a/cli/tests/test_diff_command.rs
+++ b/cli/tests/test_diff_command.rs
@@ -23,10 +23,10 @@ fn test_diff_basic() {
     let repo_path = test_env.env_root().join("repo");
 
     std::fs::write(repo_path.join("file1"), "foo\n").unwrap();
-    std::fs::write(repo_path.join("file2"), "foo\n").unwrap();
+    std::fs::write(repo_path.join("file2"), "foo\nbaz qux\n").unwrap();
     test_env.jj_cmd_ok(&repo_path, &["new"]);
     std::fs::remove_file(repo_path.join("file1")).unwrap();
-    std::fs::write(repo_path.join("file2"), "foo\nbar\n").unwrap();
+    std::fs::write(repo_path.join("file2"), "foo\nbar\nbaz quux\n").unwrap();
     std::fs::write(repo_path.join("file3"), "foo\n").unwrap();
 
     let stdout = test_env.jj_cmd_success(&repo_path, &["diff"]);
@@ -36,6 +36,7 @@ fn test_diff_basic() {
     Modified regular file file2:
        1    1: foo
             2: bar
+       2    3: baz quxquux
     Added regular file file3:
             1: foo
     "###);
@@ -47,10 +48,23 @@ fn test_diff_basic() {
     Modified regular file file2:
        1    1: foo
             2: bar
+       2    3: baz quxquux
     Added regular file file3:
             1: foo
     "###);
 
+    let stdout = test_env.jj_cmd_success(&repo_path, &["diff", "--color=debug"]);
+    insta::assert_snapshot!(stdout, @r###"
+    <<diff header::Removed >><<diff header::regular file>><<diff header:: >><<diff header::file1>><<diff header:::>>
+    <<diff removed line_number:: >><<diff removed line_number:: >><<diff removed line_number:: >><<diff removed line_number::1>><<diff:: >><<diff::    : >><<diff removed token::foo>>
+    <<diff header::Modified regular file>><<diff header:: >><<diff header::file2>><<diff header:::>>
+    <<diff removed line_number:: >><<diff removed line_number:: >><<diff removed line_number:: >><<diff removed line_number::1>><<diff:: >><<diff added line_number:: >><<diff added line_number:: >><<diff added line_number:: >><<diff added line_number::1>><<diff::: >><<diff::foo>>
+    <<diff::     >><<diff added line_number:: >><<diff added line_number:: >><<diff added line_number:: >><<diff added line_number::2>><<diff::: >><<diff added token::bar>>
+    <<diff removed line_number:: >><<diff removed line_number:: >><<diff removed line_number:: >><<diff removed line_number::2>><<diff:: >><<diff added line_number:: >><<diff added line_number:: >><<diff added line_number:: >><<diff added line_number::3>><<diff::: >><<diff::baz >><<diff removed token::qux>><<diff added token::quux>><<diff::>>
+    <<diff header::Added >><<diff header::regular file>><<diff header:: >><<diff header::file3>><<diff header:::>>
+    <<diff::     >><<diff added line_number:: >><<diff added line_number:: >><<diff added line_number:: >><<diff added line_number::1>><<diff::: >><<diff added token::foo>>
+    "###);
+
     let stdout = test_env.jj_cmd_success(&repo_path, &["diff", "-s"]);
     insta::assert_snapshot!(stdout, @r###"
     D file1
@@ -75,12 +89,14 @@ fn test_diff_basic() {
     @@ -1,1 +1,0 @@
     -foo
     diff --git a/file2 b/file2
-    index 257cc5642c...3bd1f0e297 100644
+    index 523a4a9de8...485b56a572 100644
     --- a/file2
     +++ b/file2
-    @@ -1,1 +1,2 @@
+    @@ -1,2 +1,3 @@
      foo
+    -baz qux
     +bar
+    +baz quux
     diff --git a/file3 b/file3
     new file mode 100644
     index 0000000000..257cc5642c
@@ -100,11 +116,13 @@ fn test_diff_basic() {
     @@ -1,1 +1,0 @@
     -foo
     diff --git a/file2 b/file2
-    index 257cc5642c...3bd1f0e297 100644
+    index 523a4a9de8...485b56a572 100644
     --- a/file2
     +++ b/file2
-    @@ -2,0 +2,1 @@
+    @@ -2,1 +2,2 @@
+    -baz qux
     +bar
+    +baz quux
     diff --git a/file3 b/file3
     new file mode 100644
     index 0000000000..257cc5642c
@@ -114,6 +132,33 @@ fn test_diff_basic() {
     +foo
     "###);
 
+    let stdout = test_env.jj_cmd_success(&repo_path, &["diff", "--git", "--color=debug"]);
+    insta::assert_snapshot!(stdout, @r###"
+    <<diff file_header::diff --git a/>><<diff file_header::file1>><<diff file_header:: b/>><<diff file_header::file1>><<diff file_header::>>
+    <<diff file_header::deleted file mode >><<diff file_header::100644>><<diff file_header::>>
+    <<diff file_header::index >><<diff file_header::257cc5642c>><<diff file_header::..0000000000>>
+    <<diff file_header::--- a/>><<diff file_header::file1>><<diff file_header::>>
+    <<diff file_header::+++ /dev/null>>
+    <<diff hunk_header::@@ ->><<diff hunk_header::1>><<diff hunk_header::,>><<diff hunk_header::1>><<diff hunk_header:: +>><<diff hunk_header::1>><<diff hunk_header::,>><<diff hunk_header::0>><<diff hunk_header:: @@>>
+    <<diff removed::->><<diff removed::foo>>
+    <<diff file_header::diff --git a/>><<diff file_header::file2>><<diff file_header:: b/>><<diff file_header::file2>><<diff file_header::>>
+    <<diff file_header::index >><<diff file_header::523a4a9de8>><<diff file_header::...>><<diff file_header::485b56a572>><<diff file_header:: >><<diff file_header::100644>><<diff file_header::>>
+    <<diff file_header::--- a/>><<diff file_header::file2>><<diff file_header::>>
+    <<diff file_header::+++ b/>><<diff file_header::file2>><<diff file_header::>>
+    <<diff hunk_header::@@ ->><<diff hunk_header::1>><<diff hunk_header::,>><<diff hunk_header::2>><<diff hunk_header:: +>><<diff hunk_header::1>><<diff hunk_header::,>><<diff hunk_header::3>><<diff hunk_header:: @@>>
+    <<diff context:: >><<diff context::foo>>
+    <<diff removed::->><<diff removed::baz qux>>
+    <<diff added::+>><<diff added::bar>>
+    <<diff added::+>><<diff added::baz quux>>
+    <<diff file_header::diff --git a/>><<diff file_header::file3>><<diff file_header:: b/>><<diff file_header::file3>><<diff file_header::>>
+    <<diff file_header::new file mode >><<diff file_header::100644>><<diff file_header::>>
+    <<diff file_header::index 0000000000..>><<diff file_header::257cc5642c>><<diff file_header::>>
+    <<diff file_header::--- /dev/null>>
+    <<diff file_header::+++ b/>><<diff file_header::file3>><<diff file_header::>>
+    <<diff hunk_header::@@ ->><<diff hunk_header::1>><<diff hunk_header::,>><<diff hunk_header::0>><<diff hunk_header:: +>><<diff hunk_header::1>><<diff hunk_header::,>><<diff hunk_header::1>><<diff hunk_header:: @@>>
+    <<diff added::+>><<diff added::foo>>
+    "###);
+
     let stdout = test_env.jj_cmd_success(&repo_path, &["diff", "-s", "--git"]);
     insta::assert_snapshot!(stdout, @r###"
     D file1
@@ -127,12 +172,14 @@ fn test_diff_basic() {
     @@ -1,1 +1,0 @@
     -foo
     diff --git a/file2 b/file2
-    index 257cc5642c...3bd1f0e297 100644
+    index 523a4a9de8...485b56a572 100644
     --- a/file2
     +++ b/file2
-    @@ -1,1 +1,2 @@
+    @@ -1,2 +1,3 @@
      foo
+    -baz qux
     +bar
+    +baz quux
     diff --git a/file3 b/file3
     new file mode 100644
     index 0000000000..257cc5642c
@@ -145,9 +192,9 @@ fn test_diff_basic() {
     let stdout = test_env.jj_cmd_success(&repo_path, &["diff", "--stat"]);
     insta::assert_snapshot!(stdout, @r###"
     file1 | 1 -
-    file2 | 1 +
+    file2 | 3 ++-
     file3 | 1 +
-    3 files changed, 2 insertions(+), 1 deletion(-)
+    3 files changed, 3 insertions(+), 2 deletions(-)
     "###);
 
     // Filter by glob pattern
@@ -290,6 +337,34 @@ fn test_diff_types() {
     }
 }
 
+#[test]
+fn test_diff_name_only() {
+    let test_env = TestEnvironment::default();
+    test_env.jj_cmd_ok(test_env.env_root(), &["git", "init", "repo"]);
+    let repo_path = test_env.env_root().join("repo");
+
+    test_env.jj_cmd_ok(&repo_path, &["new"]);
+    std::fs::write(repo_path.join("deleted"), "d").unwrap();
+    std::fs::write(repo_path.join("modified"), "m").unwrap();
+    insta::assert_snapshot!(test_env.jj_cmd_success(&repo_path, &["diff", "--name-only"]), @r###"
+    deleted
+    modified
+    "###);
+    test_env.jj_cmd_ok(&repo_path, &["commit", "-mfirst"]);
+    std::fs::remove_file(repo_path.join("deleted")).unwrap();
+    std::fs::write(repo_path.join("modified"), "mod").unwrap();
+    std::fs::write(repo_path.join("added"), "add").unwrap();
+    std::fs::create_dir(repo_path.join("sub")).unwrap();
+    std::fs::write(repo_path.join("sub/added"), "sub/add").unwrap();
+    insta::assert_snapshot!(test_env.jj_cmd_success(&repo_path, &["diff", "--name-only"]).replace('\\', "/"),
+    @r###"
+    added
+    deleted
+    modified
+    sub/added
+    "###);
+}
+
 #[test]
 fn test_diff_bad_args() {
     let test_env = TestEnvironment::default();
diff --git a/cli/tests/test_diffedit_command.rs b/cli/tests/test_diffedit_command.rs
index a5786cb40d..2d9cf6b9d7 100644
--- a/cli/tests/test_diffedit_command.rs
+++ b/cli/tests/test_diffedit_command.rs
@@ -394,7 +394,7 @@ fn test_diffedit_merge() {
     A file3
     "###);
     assert!(!repo_path.join("file1").exists());
-    let stdout = test_env.jj_cmd_success(&repo_path, &["print", "file2"]);
+    let stdout = test_env.jj_cmd_success(&repo_path, &["file", "show", "file2"]);
     insta::assert_snapshot!(stdout, @r###"
     <<<<<<< Conflict 1 of 1
     %%%%%%% Changes from base to side #1
diff --git a/cli/tests/test_chmod_command.rs b/cli/tests/test_file_chmod_command.rs
similarity index 89%
rename from cli/tests/test_chmod_command.rs
rename to cli/tests/test_file_chmod_command.rs
index 97af1ed789..9d7287b7b5 100644
--- a/cli/tests/test_chmod_command.rs
+++ b/cli/tests/test_file_chmod_command.rs
@@ -50,7 +50,7 @@ fn test_chmod_regular_conflict() {
     create_commit(&test_env, &repo_path, "n", &["base"], &[("file", "n\n")]);
     create_commit(&test_env, &repo_path, "x", &["base"], &[("file", "x\n")]);
     // Test chmodding a file. The effect will be visible in the conflict below.
-    test_env.jj_cmd_ok(&repo_path, &["chmod", "x", "file", "-r=x"]);
+    test_env.jj_cmd_ok(&repo_path, &["file", "chmod", "x", "file", "-r=x"]);
     create_commit(&test_env, &repo_path, "conflict", &["x", "n"], &[]);
 
     // Test the setup
@@ -68,7 +68,7 @@ fn test_chmod_regular_conflict() {
     @r###"
     file: Ok(Conflicted([Some(File { id: FileId("587be6b4c3f93f93c489c0111bba5596147a26cb"), executable: true }), Some(File { id: FileId("df967b96a579e45a18b8251732d16804b2e56a55"), executable: false }), Some(File { id: FileId("8ba3a16384aacc37d01564b28401755ce8053f51"), executable: false })]))
     "###);
-    let stdout = test_env.jj_cmd_success(&repo_path, &["cat", "file"]);
+    let stdout = test_env.jj_cmd_success(&repo_path, &["file", "show", "file"]);
     insta::assert_snapshot!(stdout, 
     @r###"
     <<<<<<< Conflict 1 of 1
@@ -81,13 +81,13 @@ fn test_chmod_regular_conflict() {
     "###);
 
     // Test chmodding a conflict
-    test_env.jj_cmd_ok(&repo_path, &["chmod", "x", "file"]);
+    test_env.jj_cmd_ok(&repo_path, &["file", "chmod", "x", "file"]);
     let stdout = test_env.jj_cmd_success(&repo_path, &["debug", "tree"]);
     insta::assert_snapshot!(stdout, 
     @r###"
     file: Ok(Conflicted([Some(File { id: FileId("587be6b4c3f93f93c489c0111bba5596147a26cb"), executable: true }), Some(File { id: FileId("df967b96a579e45a18b8251732d16804b2e56a55"), executable: true }), Some(File { id: FileId("8ba3a16384aacc37d01564b28401755ce8053f51"), executable: true })]))
     "###);
-    let stdout = test_env.jj_cmd_success(&repo_path, &["cat", "file"]);
+    let stdout = test_env.jj_cmd_success(&repo_path, &["file", "show", "file"]);
     insta::assert_snapshot!(stdout, 
     @r###"
     <<<<<<< Conflict 1 of 1
@@ -98,13 +98,13 @@ fn test_chmod_regular_conflict() {
     n
     >>>>>>> Conflict 1 of 1 ends
     "###);
-    test_env.jj_cmd_ok(&repo_path, &["chmod", "n", "file"]);
+    test_env.jj_cmd_ok(&repo_path, &["file", "chmod", "n", "file"]);
     let stdout = test_env.jj_cmd_success(&repo_path, &["debug", "tree"]);
     insta::assert_snapshot!(stdout, 
     @r###"
     file: Ok(Conflicted([Some(File { id: FileId("587be6b4c3f93f93c489c0111bba5596147a26cb"), executable: false }), Some(File { id: FileId("df967b96a579e45a18b8251732d16804b2e56a55"), executable: false }), Some(File { id: FileId("8ba3a16384aacc37d01564b28401755ce8053f51"), executable: false })]))
     "###);
-    let stdout = test_env.jj_cmd_success(&repo_path, &["cat", "file"]);
+    let stdout = test_env.jj_cmd_success(&repo_path, &["file", "show", "file"]);
     insta::assert_snapshot!(stdout, 
     @r###"
     <<<<<<< Conflict 1 of 1
@@ -117,7 +117,8 @@ fn test_chmod_regular_conflict() {
     "###);
 
     // Unmatched paths should generate warnings
-    let (_stdout, stderr) = test_env.jj_cmd_ok(&repo_path, &["chmod", "x", "nonexistent", "file"]);
+    let (_stdout, stderr) =
+        test_env.jj_cmd_ok(&repo_path, &["file", "chmod", "x", "nonexistent", "file"]);
     insta::assert_snapshot!(stderr, @r###"
     Warning: No matching entries for paths: nonexistent
     Working copy now at: yostqsxw e5912d62 conflict | (conflict) conflict
@@ -179,7 +180,7 @@ fn test_chmod_file_dir_deletion_conflicts() {
     @r###"
     file: Ok(Conflicted([Some(File { id: FileId("78981922613b2afb6025042ff6bd878ac1994e85"), executable: false }), Some(File { id: FileId("df967b96a579e45a18b8251732d16804b2e56a55"), executable: false }), Some(Tree(TreeId("133bb38fc4e4bf6b551f1f04db7e48f04cac2877")))]))
     "###);
-    let stdout = test_env.jj_cmd_success(&repo_path, &["cat", "-r=file_dir", "file"]);
+    let stdout = test_env.jj_cmd_success(&repo_path, &["file", "show", "-r=file_dir", "file"]);
     insta::assert_snapshot!(stdout,
     @r###"
     Conflict:
@@ -187,7 +188,8 @@ fn test_chmod_file_dir_deletion_conflicts() {
       Adding file with id 78981922613b2afb6025042ff6bd878ac1994e85
       Adding tree with id 133bb38fc4e4bf6b551f1f04db7e48f04cac2877
     "###);
-    let stderr = test_env.jj_cmd_failure(&repo_path, &["chmod", "x", "file", "-r=file_dir"]);
+    let stderr =
+        test_env.jj_cmd_failure(&repo_path, &["file", "chmod", "x", "file", "-r=file_dir"]);
     insta::assert_snapshot!(stderr, @r###"
     Error: Some of the sides of the conflict are not files at 'file'.
     "###);
@@ -198,7 +200,7 @@ fn test_chmod_file_dir_deletion_conflicts() {
     @r###"
     file: Ok(Conflicted([Some(File { id: FileId("78981922613b2afb6025042ff6bd878ac1994e85"), executable: false }), Some(File { id: FileId("df967b96a579e45a18b8251732d16804b2e56a55"), executable: false }), None]))
     "###);
-    let stdout = test_env.jj_cmd_success(&repo_path, &["cat", "-r=file_deletion", "file"]);
+    let stdout = test_env.jj_cmd_success(&repo_path, &["file", "show", "-r=file_deletion", "file"]);
     insta::assert_snapshot!(stdout,
     @r###"
     <<<<<<< Conflict 1 of 1
@@ -208,8 +210,10 @@ fn test_chmod_file_dir_deletion_conflicts() {
     -base
     >>>>>>> Conflict 1 of 1 ends
     "###);
-    let (stdout, stderr) =
-        test_env.jj_cmd_ok(&repo_path, &["chmod", "x", "file", "-r=file_deletion"]);
+    let (stdout, stderr) = test_env.jj_cmd_ok(
+        &repo_path,
+        &["file", "chmod", "x", "file", "-r=file_deletion"],
+    );
     insta::assert_snapshot!(stdout, @"");
     insta::assert_snapshot!(stderr, @r###"
     New conflicts appeared in these commits:
@@ -231,7 +235,7 @@ fn test_chmod_file_dir_deletion_conflicts() {
     @r###"
     file: Ok(Conflicted([Some(File { id: FileId("78981922613b2afb6025042ff6bd878ac1994e85"), executable: true }), Some(File { id: FileId("df967b96a579e45a18b8251732d16804b2e56a55"), executable: true }), None]))
     "###);
-    let stdout = test_env.jj_cmd_success(&repo_path, &["cat", "-r=file_deletion", "file"]);
+    let stdout = test_env.jj_cmd_success(&repo_path, &["file", "show", "-r=file_deletion", "file"]);
     insta::assert_snapshot!(stdout,
     @r###"
     <<<<<<< Conflict 1 of 1
diff --git a/cli/tests/test_cat_command.rs b/cli/tests/test_file_print_command.rs
similarity index 77%
rename from cli/tests/test_cat_command.rs
rename to cli/tests/test_file_print_command.rs
index 98fd088365..c7643c57e6 100644
--- a/cli/tests/test_cat_command.rs
+++ b/cli/tests/test_file_print_command.rs
@@ -15,7 +15,7 @@
 use crate::common::TestEnvironment;
 
 #[test]
-fn test_cat() {
+fn test_print() {
     let test_env = TestEnvironment::default();
     test_env.jj_cmd_ok(test_env.env_root(), &["git", "init", "repo"]);
     let repo_path = test_env.env_root().join("repo");
@@ -27,19 +27,13 @@ fn test_cat() {
     std::fs::write(repo_path.join("dir").join("file2"), "c\n").unwrap();
 
     // Can print the contents of a file in a commit
-    let stdout = test_env.jj_cmd_success(&repo_path, &["cat", "file1", "-r", "@-"]);
+    let stdout = test_env.jj_cmd_success(&repo_path, &["file", "show", "file1", "-r", "@-"]);
     insta::assert_snapshot!(stdout, @r###"
     a
     "###);
 
     // Defaults to printing the working-copy version
-    let stdout = test_env.jj_cmd_success(&repo_path, &["cat", "file1"]);
-    insta::assert_snapshot!(stdout, @r###"
-    b
-    "###);
-
-    // `print` is an alias for `cat`
-    let stdout = test_env.jj_cmd_success(&repo_path, &["print", "file1"]);
+    let stdout = test_env.jj_cmd_success(&repo_path, &["file", "show", "file1"]);
     insta::assert_snapshot!(stdout, @r###"
     b
     "###);
@@ -50,32 +44,33 @@ fn test_cat() {
     } else {
         "dir\\file2"
     };
-    let stdout = test_env.jj_cmd_success(&repo_path, &["cat", subdir_file]);
+    let stdout = test_env.jj_cmd_success(&repo_path, &["file", "show", subdir_file]);
     insta::assert_snapshot!(stdout, @r###"
     c
     "###);
 
     // Error if the path doesn't exist
-    let stderr = test_env.jj_cmd_failure(&repo_path, &["cat", "nonexistent"]);
+    let stderr = test_env.jj_cmd_failure(&repo_path, &["file", "show", "nonexistent"]);
     insta::assert_snapshot!(stderr, @r###"
     Error: No such path: nonexistent
     "###);
 
     // Can print files under the specified directory
-    let stdout = test_env.jj_cmd_success(&repo_path, &["cat", "dir"]);
+    let stdout = test_env.jj_cmd_success(&repo_path, &["file", "show", "dir"]);
     insta::assert_snapshot!(stdout, @r###"
     c
     "###);
 
     // Can print multiple files
-    let stdout = test_env.jj_cmd_success(&repo_path, &["cat", "."]);
+    let stdout = test_env.jj_cmd_success(&repo_path, &["file", "show", "."]);
     insta::assert_snapshot!(stdout, @r###"
     c
     b
     "###);
 
     // Unmatched paths should generate warnings
-    let (stdout, stderr) = test_env.jj_cmd_ok(&repo_path, &["cat", "file1", "non-existent"]);
+    let (stdout, stderr) =
+        test_env.jj_cmd_ok(&repo_path, &["file", "show", "file1", "non-existent"]);
     insta::assert_snapshot!(stdout, @r###"
     b
     "###);
@@ -87,7 +82,7 @@ fn test_cat() {
     test_env.jj_cmd_ok(&repo_path, &["new"]);
     std::fs::write(repo_path.join("file1"), "c\n").unwrap();
     test_env.jj_cmd_ok(&repo_path, &["rebase", "-r", "@", "-d", "@--"]);
-    let stdout = test_env.jj_cmd_success(&repo_path, &["cat", "file1"]);
+    let stdout = test_env.jj_cmd_success(&repo_path, &["file", "show", "file1"]);
     insta::assert_snapshot!(stdout, @r###"
     <<<<<<< Conflict 1 of 1
     %%%%%%% Changes from base to side #1
@@ -101,7 +96,7 @@ fn test_cat() {
 
 #[cfg(unix)]
 #[test]
-fn test_cat_symlink() {
+fn test_print_symlink() {
     let test_env = TestEnvironment::default();
     test_env.jj_cmd_ok(test_env.env_root(), &["git", "init", "repo"]);
     let repo_path = test_env.env_root().join("repo");
@@ -112,7 +107,7 @@ fn test_cat_symlink() {
     std::os::unix::fs::symlink("symlink1_target", repo_path.join("symlink1")).unwrap();
 
     // Can print multiple files
-    let (stdout, stderr) = test_env.jj_cmd_ok(&repo_path, &["cat", "."]);
+    let (stdout, stderr) = test_env.jj_cmd_ok(&repo_path, &["file", "show", "."]);
     insta::assert_snapshot!(stdout, @r###"
     c
     a
diff --git a/cli/tests/test_fix_command.rs b/cli/tests/test_fix_command.rs
index 695d7b2b1b..fe899a02a2 100644
--- a/cli/tests/test_fix_command.rs
+++ b/cli/tests/test_fix_command.rs
@@ -79,9 +79,9 @@ fn test_fix_leaf_commit() {
     Parent commit      : qpvuntsm fda57e40 (no description set)
     Added 0 files, modified 1 files, removed 0 files
     "###);
-    let content = test_env.jj_cmd_success(&repo_path, &["print", "file", "-r", "@-"]);
+    let content = test_env.jj_cmd_success(&repo_path, &["file", "show", "file", "-r", "@-"]);
     insta::assert_snapshot!(content, @"unaffected");
-    let content = test_env.jj_cmd_success(&repo_path, &["print", "file", "-r", "@"]);
+    let content = test_env.jj_cmd_success(&repo_path, &["file", "show", "file", "-r", "@"]);
     insta::assert_snapshot!(content, @"AFFECTED");
 }
 
@@ -106,11 +106,11 @@ fn test_fix_parent_commit() {
     Parent commit      : qpvuntsm 4f4d2103 parent | (no description set)
     Added 0 files, modified 1 files, removed 0 files
     "###);
-    let content = test_env.jj_cmd_success(&repo_path, &["print", "file", "-r", "parent"]);
+    let content = test_env.jj_cmd_success(&repo_path, &["file", "show", "file", "-r", "parent"]);
     insta::assert_snapshot!(content, @"PARENT");
-    let content = test_env.jj_cmd_success(&repo_path, &["print", "file", "-r", "child1"]);
+    let content = test_env.jj_cmd_success(&repo_path, &["file", "show", "file", "-r", "child1"]);
     insta::assert_snapshot!(content, @"CHILD1");
-    let content = test_env.jj_cmd_success(&repo_path, &["print", "file", "-r", "child2"]);
+    let content = test_env.jj_cmd_success(&repo_path, &["file", "show", "file", "-r", "child2"]);
     insta::assert_snapshot!(content, @"CHILD2");
 }
 
@@ -131,11 +131,11 @@ fn test_fix_sibling_commit() {
     insta::assert_snapshot!(stderr, @r###"
     Fixed 1 commits of 1 checked.
     "###);
-    let content = test_env.jj_cmd_success(&repo_path, &["print", "file", "-r", "parent"]);
+    let content = test_env.jj_cmd_success(&repo_path, &["file", "show", "file", "-r", "parent"]);
     insta::assert_snapshot!(content, @"parent");
-    let content = test_env.jj_cmd_success(&repo_path, &["print", "file", "-r", "child1"]);
+    let content = test_env.jj_cmd_success(&repo_path, &["file", "show", "file", "-r", "child1"]);
     insta::assert_snapshot!(content, @"CHILD1");
-    let content = test_env.jj_cmd_success(&repo_path, &["print", "file", "-r", "child2"]);
+    let content = test_env.jj_cmd_success(&repo_path, &["file", "show", "file", "-r", "child2"]);
     insta::assert_snapshot!(content, @"child2");
 }
 
@@ -173,17 +173,17 @@ fn test_default_revset() {
     Parent commit      : yqosqzyt 4747dd17 bar1 | (no description set)
     Added 0 files, modified 1 files, removed 0 files
     "###);
-    let content = test_env.jj_cmd_success(&repo_path, &["print", "file", "-r", "trunk1"]);
+    let content = test_env.jj_cmd_success(&repo_path, &["file", "show", "file", "-r", "trunk1"]);
     insta::assert_snapshot!(content, @"trunk1");
-    let content = test_env.jj_cmd_success(&repo_path, &["print", "file", "-r", "trunk2"]);
+    let content = test_env.jj_cmd_success(&repo_path, &["file", "show", "file", "-r", "trunk2"]);
     insta::assert_snapshot!(content, @"trunk2");
-    let content = test_env.jj_cmd_success(&repo_path, &["print", "file", "-r", "foo"]);
+    let content = test_env.jj_cmd_success(&repo_path, &["file", "show", "file", "-r", "foo"]);
     insta::assert_snapshot!(content, @"foo");
-    let content = test_env.jj_cmd_success(&repo_path, &["print", "file", "-r", "bar1"]);
+    let content = test_env.jj_cmd_success(&repo_path, &["file", "show", "file", "-r", "bar1"]);
     insta::assert_snapshot!(content, @"BAR1");
-    let content = test_env.jj_cmd_success(&repo_path, &["print", "file", "-r", "bar2"]);
+    let content = test_env.jj_cmd_success(&repo_path, &["file", "show", "file", "-r", "bar2"]);
     insta::assert_snapshot!(content, @"BAR2");
-    let content = test_env.jj_cmd_success(&repo_path, &["print", "file", "-r", "bar3"]);
+    let content = test_env.jj_cmd_success(&repo_path, &["file", "show", "file", "-r", "bar3"]);
     insta::assert_snapshot!(content, @"BAR3");
 }
 
@@ -207,9 +207,9 @@ fn test_custom_default_revset() {
     insta::assert_snapshot!(stderr, @r###"
     Fixed 1 commits of 1 checked.
     "###);
-    let content = test_env.jj_cmd_success(&repo_path, &["print", "file", "-r", "foo"]);
+    let content = test_env.jj_cmd_success(&repo_path, &["file", "show", "file", "-r", "foo"]);
     insta::assert_snapshot!(content, @"foo");
-    let content = test_env.jj_cmd_success(&repo_path, &["print", "file", "-r", "bar"]);
+    let content = test_env.jj_cmd_success(&repo_path, &["file", "show", "file", "-r", "bar"]);
     insta::assert_snapshot!(content, @"BAR");
 }
 
@@ -228,9 +228,9 @@ fn test_fix_immutable_commit() {
     Error: Commit 83eee3c8dce2 is immutable
     Hint: Pass `--ignore-immutable` or configure the set of immutable commits via `revset-aliases.immutable_heads()`.
     "###);
-    let content = test_env.jj_cmd_success(&repo_path, &["print", "file", "-r", "immutable"]);
+    let content = test_env.jj_cmd_success(&repo_path, &["file", "show", "file", "-r", "immutable"]);
     insta::assert_snapshot!(content, @"immutable");
-    let content = test_env.jj_cmd_success(&repo_path, &["print", "file", "-r", "mutable"]);
+    let content = test_env.jj_cmd_success(&repo_path, &["file", "show", "file", "-r", "mutable"]);
     insta::assert_snapshot!(content, @"mutable");
 }
 
@@ -245,7 +245,7 @@ fn test_fix_empty_file() {
     Fixed 0 commits of 1 checked.
     Nothing changed.
     "###);
-    let content = test_env.jj_cmd_success(&repo_path, &["print", "file", "-r", "@"]);
+    let content = test_env.jj_cmd_success(&repo_path, &["file", "show", "file", "-r", "@"]);
     insta::assert_snapshot!(content, @"");
 }
 
@@ -263,11 +263,11 @@ fn test_fix_some_paths() {
     Parent commit      : zzzzzzzz 00000000 (empty) (no description set)
     Added 0 files, modified 1 files, removed 0 files
     "###);
-    let content = test_env.jj_cmd_success(&repo_path, &["print", "file1"]);
+    let content = test_env.jj_cmd_success(&repo_path, &["file", "show", "file1"]);
     insta::assert_snapshot!(content, @r###"
     FOO
     "###);
-    let content = test_env.jj_cmd_success(&repo_path, &["print", "file2"]);
+    let content = test_env.jj_cmd_success(&repo_path, &["file", "show", "file2"]);
     insta::assert_snapshot!(content, @"bar");
 }
 
@@ -284,7 +284,7 @@ fn test_fix_cyclic() {
     Parent commit      : zzzzzzzz 00000000 (empty) (no description set)
     Added 0 files, modified 1 files, removed 0 files
     "###);
-    let content = test_env.jj_cmd_success(&repo_path, &["print", "file", "-r", "@"]);
+    let content = test_env.jj_cmd_success(&repo_path, &["file", "show", "file", "-r", "@"]);
     insta::assert_snapshot!(content, @"tnetnoc\n");
 
     let (stdout, stderr) = test_env.jj_cmd_ok(&repo_path, &["fix"]);
@@ -295,7 +295,7 @@ fn test_fix_cyclic() {
     Parent commit      : zzzzzzzz 00000000 (empty) (no description set)
     Added 0 files, modified 1 files, removed 0 files
     "###);
-    let content = test_env.jj_cmd_success(&repo_path, &["print", "file", "-r", "@"]);
+    let content = test_env.jj_cmd_success(&repo_path, &["file", "show", "file", "-r", "@"]);
     insta::assert_snapshot!(content, @"content\n");
 }
 
@@ -328,13 +328,13 @@ fn test_deduplication() {
     Parent commit      : mzvwutvl 90d9a032 c | (empty) (no description set)
     Added 0 files, modified 1 files, removed 0 files
     "###);
-    let content = test_env.jj_cmd_success(&repo_path, &["print", "file", "-r", "a"]);
+    let content = test_env.jj_cmd_success(&repo_path, &["file", "show", "file", "-r", "a"]);
     insta::assert_snapshot!(content, @"FOO\n");
-    let content = test_env.jj_cmd_success(&repo_path, &["print", "file", "-r", "b"]);
+    let content = test_env.jj_cmd_success(&repo_path, &["file", "show", "file", "-r", "b"]);
     insta::assert_snapshot!(content, @"BAR\n");
-    let content = test_env.jj_cmd_success(&repo_path, &["print", "file", "-r", "c"]);
+    let content = test_env.jj_cmd_success(&repo_path, &["file", "show", "file", "-r", "c"]);
     insta::assert_snapshot!(content, @"BAR\n");
-    let content = test_env.jj_cmd_success(&repo_path, &["print", "file", "-r", "d"]);
+    let content = test_env.jj_cmd_success(&repo_path, &["file", "show", "file", "-r", "d"]);
     insta::assert_snapshot!(content, @"FOO\n");
 
     // Each new content string only appears once in the log, because all the other
@@ -366,7 +366,7 @@ fn test_executed_but_nothing_changed() {
     Fixed 0 commits of 1 checked.
     Nothing changed.
     "###);
-    let content = test_env.jj_cmd_success(&repo_path, &["print", "file", "-r", "@"]);
+    let content = test_env.jj_cmd_success(&repo_path, &["file", "show", "file", "-r", "@"]);
     insta::assert_snapshot!(content, @"content\n");
     let copy_content = std::fs::read_to_string(repo_path.join("file-copy").as_os_str()).unwrap();
     insta::assert_snapshot!(copy_content, @"content\n");
@@ -383,7 +383,7 @@ fn test_failure() {
     Fixed 0 commits of 1 checked.
     Nothing changed.
     "###);
-    let content = test_env.jj_cmd_success(&repo_path, &["print", "file", "-r", "@"]);
+    let content = test_env.jj_cmd_success(&repo_path, &["file", "show", "file", "-r", "@"]);
     insta::assert_snapshot!(content, @"content");
 }
 
@@ -403,7 +403,7 @@ fn test_stderr_success() {
     Parent commit      : zzzzzzzz 00000000 (empty) (no description set)
     Added 0 files, modified 1 files, removed 0 files
     "###);
-    let content = test_env.jj_cmd_success(&repo_path, &["print", "file", "-r", "@"]);
+    let content = test_env.jj_cmd_success(&repo_path, &["file", "show", "file", "-r", "@"]);
     insta::assert_snapshot!(content, @"new content");
 }
 
@@ -419,7 +419,7 @@ fn test_stderr_failure() {
     errorFixed 0 commits of 1 checked.
     Nothing changed.
     "###);
-    let content = test_env.jj_cmd_success(&repo_path, &["print", "file", "-r", "@"]);
+    let content = test_env.jj_cmd_success(&repo_path, &["file", "show", "file", "-r", "@"]);
     insta::assert_snapshot!(content, @"old content");
 }
 
@@ -455,7 +455,7 @@ fn test_fix_file_types() {
     Parent commit      : zzzzzzzz 00000000 (empty) (no description set)
     Added 0 files, modified 1 files, removed 0 files
     "###);
-    let content = test_env.jj_cmd_success(&repo_path, &["print", "file", "-r", "@"]);
+    let content = test_env.jj_cmd_success(&repo_path, &["file", "show", "file", "-r", "@"]);
     insta::assert_snapshot!(content, @"CONTENT");
 }
 
@@ -477,7 +477,7 @@ fn test_fix_executable() {
     Parent commit      : zzzzzzzz 00000000 (empty) (no description set)
     Added 0 files, modified 1 files, removed 0 files
     "###);
-    let content = test_env.jj_cmd_success(&repo_path, &["print", "file", "-r", "@"]);
+    let content = test_env.jj_cmd_success(&repo_path, &["file", "show", "file", "-r", "@"]);
     insta::assert_snapshot!(content, @"CONTENT");
     let executable = std::fs::metadata(&path).unwrap().permissions().mode() & 0o111;
     assert_eq!(executable, 0o111);
@@ -503,11 +503,11 @@ fn test_fix_trivial_merge_commit() {
     Fixed 0 commits of 1 checked.
     Nothing changed.
     "###);
-    let content = test_env.jj_cmd_success(&repo_path, &["print", "file_a", "-r", "@"]);
+    let content = test_env.jj_cmd_success(&repo_path, &["file", "show", "file_a", "-r", "@"]);
     insta::assert_snapshot!(content, @"content a");
-    let content = test_env.jj_cmd_success(&repo_path, &["print", "file_b", "-r", "@"]);
+    let content = test_env.jj_cmd_success(&repo_path, &["file", "show", "file_b", "-r", "@"]);
     insta::assert_snapshot!(content, @"content b");
-    let content = test_env.jj_cmd_success(&repo_path, &["print", "file_c", "-r", "@"]);
+    let content = test_env.jj_cmd_success(&repo_path, &["file", "show", "file_c", "-r", "@"]);
     insta::assert_snapshot!(content, @"content c");
 }
 
@@ -538,13 +538,13 @@ fn test_fix_adding_merge_commit() {
     Parent commit      : kkmpptxz 82e9bc6a b | (no description set)
     Added 0 files, modified 4 files, removed 0 files
     "###);
-    let content = test_env.jj_cmd_success(&repo_path, &["print", "file_a", "-r", "@"]);
+    let content = test_env.jj_cmd_success(&repo_path, &["file", "show", "file_a", "-r", "@"]);
     insta::assert_snapshot!(content, @"CHANGE A");
-    let content = test_env.jj_cmd_success(&repo_path, &["print", "file_b", "-r", "@"]);
+    let content = test_env.jj_cmd_success(&repo_path, &["file", "show", "file_b", "-r", "@"]);
     insta::assert_snapshot!(content, @"CHANGE B");
-    let content = test_env.jj_cmd_success(&repo_path, &["print", "file_c", "-r", "@"]);
+    let content = test_env.jj_cmd_success(&repo_path, &["file", "show", "file_c", "-r", "@"]);
     insta::assert_snapshot!(content, @"CHANGE C");
-    let content = test_env.jj_cmd_success(&repo_path, &["print", "file_d", "-r", "@"]);
+    let content = test_env.jj_cmd_success(&repo_path, &["file", "show", "file_d", "-r", "@"]);
     insta::assert_snapshot!(content, @"CHANGE D");
 }
 
@@ -571,15 +571,15 @@ fn test_fix_both_sides_of_conflict() {
     There are unresolved conflicts at these paths:
     file    2-sided conflict
     "###);
-    let content = test_env.jj_cmd_success(&repo_path, &["print", "file", "-r", "a"]);
+    let content = test_env.jj_cmd_success(&repo_path, &["file", "show", "file", "-r", "a"]);
     insta::assert_snapshot!(content, @r###"
     CONTENT A
     "###);
-    let content = test_env.jj_cmd_success(&repo_path, &["print", "file", "-r", "b"]);
+    let content = test_env.jj_cmd_success(&repo_path, &["file", "show", "file", "-r", "b"]);
     insta::assert_snapshot!(content, @r###"
     CONTENT B
     "###);
-    let content = test_env.jj_cmd_success(&repo_path, &["print", "file", "-r", "@"]);
+    let content = test_env.jj_cmd_success(&repo_path, &["file", "show", "file", "-r", "@"]);
     insta::assert_snapshot!(content, @r###"
     <<<<<<< Conflict 1 of 1
     %%%%%%% Changes from base to side #1
@@ -613,7 +613,7 @@ fn test_fix_resolve_conflict() {
     Parent commit      : kkmpptxz 82703f5e b | (no description set)
     Added 0 files, modified 1 files, removed 0 files
     "###);
-    let content = test_env.jj_cmd_success(&repo_path, &["print", "file", "-r", "@"]);
+    let content = test_env.jj_cmd_success(&repo_path, &["file", "show", "file", "-r", "@"]);
     insta::assert_snapshot!(content, @r###"
     CONTENT
     "###);
diff --git a/cli/tests/test_generate_md_cli_help.rs b/cli/tests/test_generate_md_cli_help.rs
index a752a09ef2..c4a6c32ce5 100644
--- a/cli/tests/test_generate_md_cli_help.rs
+++ b/cli/tests/test_generate_md_cli_help.rs
@@ -27,18 +27,15 @@ fn test_generate_markdown_docs_in_docs_dir() {
     let mut markdown_help = PREAMBLE.to_string();
     markdown_help
         .push_str(&test_env.jj_cmd_success(test_env.env_root(), &["util", "markdown-help"]));
-    // Validate partial snapshot, redacting any lines nested 2+ indent levels.
+
     insta::with_settings!({
         snapshot_path => ".",
         snapshot_suffix => ".md",
         prepend_module_to_snapshot => false,
         omit_expression => true,
-        description => "AUTO-GENERATED FILE, DO NOT EDIT. This cli reference is generated as an \
-                        `insta` snapshot. MkDocs follows they symlink from docs/cli-reference.md \
-                        to the snap. Unfortunately, `insta` unavoidably creates this header. Luckily, \
-                        MkDocs ignores the header since it has the same format as Markdown headers. \
-                        TODO: MkDocs may fail on Windows if symlinks are not enabled in the OS \
-                        settings",
+        description => "AUTO-GENERATED FILE, DO NOT EDIT. This cli reference is generated \
+                        by a test as an `insta` snapshot. MkDocs includes this snapshot \
+                        from docs/cli-reference.md.",
     },
     { assert_snapshot!("cli-reference", markdown_help) });
 }
diff --git a/cli/tests/test_git_fetch.rs b/cli/tests/test_git_fetch.rs
index 766d0d5e8f..411a6bf98f 100644
--- a/cli/tests/test_git_fetch.rs
+++ b/cli/tests/test_git_fetch.rs
@@ -1190,7 +1190,7 @@ fn test_git_fetch_removed_parent_branch() {
     "###);
 
     // Remove all branches in origin.
-    test_env.jj_cmd_ok(&source_git_repo_path, &["branch", "forget", "--glob", "*"]);
+    test_env.jj_cmd_ok(&source_git_repo_path, &["branch", "forget", "glob:*"]);
 
     // Fetch branches master, trunk1 and a1 from origin and check that only those
     // branches have been removed and that others were not rebased because of
diff --git a/cli/tests/test_git_push.rs b/cli/tests/test_git_push.rs
index 9e3b01ce25..3f7c6f6d73 100644
--- a/cli/tests/test_git_push.rs
+++ b/cli/tests/test_git_push.rs
@@ -580,27 +580,36 @@ fn test_git_push_changes() {
     let (stdout, stderr) = test_env.jj_cmd_ok(&workspace_root, &["git", "push", "--change", "@"]);
     insta::assert_snapshot!(stdout, @"");
     insta::assert_snapshot!(stderr, @r###"
-    Creating branch push-yostqsxwqrlt for revision @
+    Creating branch push-yostqsxwqrlt for revision yostqsxwqrlt
     Branch changes to push to origin:
       Add branch push-yostqsxwqrlt to 28d7620ea63a
     "###);
     // test pushing two changes at once
     std::fs::write(workspace_root.join("file"), "modified2").unwrap();
-    let (stdout, stderr) = test_env.jj_cmd_ok(&workspace_root, &["git", "push", "-c=@", "-c=@-"]);
+    let stderr = test_env.jj_cmd_failure(&workspace_root, &["git", "push", "-c=(@|@-)"]);
+    insta::assert_snapshot!(stderr, @r###"
+    Error: Revset "(@|@-)" resolved to more than one revision
+    Hint: The revset "(@|@-)" resolved to these revisions:
+      yostqsxw 48d8c794 push-yostqsxwqrlt* | bar
+      yqosqzyt fa16a141 foo
+    Hint: Prefix the expression with 'all:' to allow any number of revisions (i.e. 'all:(@|@-)').
+    "###);
+    // test pushing two changes at once, part 2
+    let (stdout, stderr) = test_env.jj_cmd_ok(&workspace_root, &["git", "push", "-c=all:(@|@-)"]);
     insta::assert_snapshot!(stdout, @"");
     insta::assert_snapshot!(stderr, @r###"
-    Creating branch push-yqosqzytrlsw for revision @-
+    Creating branch push-yqosqzytrlsw for revision yqosqzytrlsw
     Branch changes to push to origin:
       Move sideways branch push-yostqsxwqrlt from 28d7620ea63a to 48d8c7948133
       Add branch push-yqosqzytrlsw to fa16a14170fb
     "###);
     // specifying the same change twice doesn't break things
     std::fs::write(workspace_root.join("file"), "modified3").unwrap();
-    let (stdout, stderr) = test_env.jj_cmd_ok(&workspace_root, &["git", "push", "-c=@", "-c=@"]);
+    let (stdout, stderr) = test_env.jj_cmd_ok(&workspace_root, &["git", "push", "-c=all:(@|@)"]);
     insta::assert_snapshot!(stdout, @"");
     insta::assert_snapshot!(stderr, @r###"
     Branch changes to push to origin:
-      Move sideways branch push-yostqsxwqrlt from 48d8c7948133 to b5f030322b1d
+      Move sideways branch push-yostqsxwqrlt from 48d8c7948133 to 8a2941b572b9
     "###);
 
     // specifying the same branch with --change/--branch doesn't break things
@@ -612,7 +621,7 @@ fn test_git_push_changes() {
     insta::assert_snapshot!(stdout, @"");
     insta::assert_snapshot!(stderr, @r###"
     Branch changes to push to origin:
-      Move sideways branch push-yostqsxwqrlt from b5f030322b1d to 4df62cec2ee4
+      Move sideways branch push-yostqsxwqrlt from 8a2941b572b9 to 5b65c040beef
     "###);
 
     // try again with --change that moves the branch forward
@@ -631,7 +640,7 @@ fn test_git_push_changes() {
     insta::assert_snapshot!(stdout, @r###"
     Working copy changes:
     M file
-    Working copy : yostqsxw 3e2ce808 bar
+    Working copy : yostqsxw 361948b1 bar
     Parent commit: yqosqzyt fa16a141 push-yostqsxwqrlt* push-yqosqzytrlsw | foo
     "###);
     let (stdout, stderr) = test_env.jj_cmd_ok(
@@ -641,13 +650,13 @@ fn test_git_push_changes() {
     insta::assert_snapshot!(stdout, @"");
     insta::assert_snapshot!(stderr, @r###"
     Branch changes to push to origin:
-      Move sideways branch push-yostqsxwqrlt from 4df62cec2ee4 to 3e2ce808759b
+      Move sideways branch push-yostqsxwqrlt from 5b65c040beef to 361948b172e3
     "###);
     let stdout = test_env.jj_cmd_success(&workspace_root, &["status"]);
     insta::assert_snapshot!(stdout, @r###"
     Working copy changes:
     M file
-    Working copy : yostqsxw 3e2ce808 push-yostqsxwqrlt | bar
+    Working copy : yostqsxw 361948b1 push-yostqsxwqrlt | bar
     Parent commit: yqosqzyt fa16a141 push-yqosqzytrlsw | foo
     "###);
 
@@ -664,9 +673,9 @@ fn test_git_push_changes() {
     );
     insta::assert_snapshot!(stdout, @"");
     insta::assert_snapshot!(stderr, @r###"
-    Creating branch test-yostqsxwqrlt for revision @
+    Creating branch test-yostqsxwqrlt for revision yostqsxwqrlt
     Branch changes to push to origin:
-      Add branch test-yostqsxwqrlt to 3e2ce808759b
+      Add branch test-yostqsxwqrlt to 361948b172e3
     "###);
 }
 
@@ -759,7 +768,7 @@ fn test_git_push_mixed() {
     );
     insta::assert_snapshot!(stdout, @"");
     insta::assert_snapshot!(stderr, @r###"
-    Creating branch push-yqosqzytrlsw for revision @--
+    Creating branch push-yqosqzytrlsw for revision yqosqzytrlsw
     Branch changes to push to origin:
       Add branch push-yqosqzytrlsw to fa16a14170fb
       Add branch branch-1 to 7decc7932d9c
@@ -835,6 +844,36 @@ fn test_git_push_no_description() {
     );
 }
 
+#[test]
+fn test_git_push_no_description_in_immutable() {
+    let (test_env, workspace_root) = set_up();
+    test_env.jj_cmd_ok(&workspace_root, &["branch", "create", "imm"]);
+    test_env.jj_cmd_ok(&workspace_root, &["describe", "-m="]);
+    test_env.jj_cmd_ok(&workspace_root, &["new", "-m", "foo"]);
+    std::fs::write(workspace_root.join("file"), "contents").unwrap();
+    test_env.jj_cmd_ok(&workspace_root, &["branch", "create", "my-branch"]);
+
+    let stderr = test_env.jj_cmd_failure(
+        &workspace_root,
+        &["git", "push", "--branch=my-branch", "--dry-run"],
+    );
+    insta::assert_snapshot!(stderr, @r###"
+    Error: Won't push commit 5b36783cd11c since it has no description
+    "###);
+
+    test_env.add_config(r#"revset-aliases."immutable_heads()" = "imm""#);
+    let (stdout, stderr) = test_env.jj_cmd_ok(
+        &workspace_root,
+        &["git", "push", "--branch=my-branch", "--dry-run"],
+    );
+    insta::assert_snapshot!(stdout, @"");
+    insta::assert_snapshot!(stderr, @r###"
+    Branch changes to push to origin:
+      Add branch my-branch to ea7373507ad9
+    Dry-run requested, not pushing.
+    "###);
+}
+
 #[test]
 fn test_git_push_missing_author() {
     let (test_env, workspace_root) = set_up();
@@ -863,6 +902,44 @@ fn test_git_push_missing_author() {
     "###);
 }
 
+#[test]
+fn test_git_push_missing_author_in_immutable() {
+    let (test_env, workspace_root) = set_up();
+    let run_without_var = |var: &str, args: &[&str]| {
+        test_env
+            .jj_cmd(&workspace_root, args)
+            .env_remove(var)
+            .assert()
+            .success();
+    };
+    run_without_var("JJ_USER", &["new", "root()", "-m=no author name"]);
+    run_without_var("JJ_EMAIL", &["new", "-m=no author email"]);
+    test_env.jj_cmd_ok(&workspace_root, &["branch", "create", "imm"]);
+    test_env.jj_cmd_ok(&workspace_root, &["new", "-m", "foo"]);
+    std::fs::write(workspace_root.join("file"), "contents").unwrap();
+    test_env.jj_cmd_ok(&workspace_root, &["branch", "create", "my-branch"]);
+
+    let stderr = test_env.jj_cmd_failure(
+        &workspace_root,
+        &["git", "push", "--branch=my-branch", "--dry-run"],
+    );
+    insta::assert_snapshot!(stderr, @r###"
+    Error: Won't push commit 011f740bf8b5 since it has no author and/or committer set
+    "###);
+
+    test_env.add_config(r#"revset-aliases."immutable_heads()" = "imm""#);
+    let (stdout, stderr) = test_env.jj_cmd_ok(
+        &workspace_root,
+        &["git", "push", "--branch=my-branch", "--dry-run"],
+    );
+    insta::assert_snapshot!(stdout, @"");
+    insta::assert_snapshot!(stderr, @r###"
+    Branch changes to push to origin:
+      Add branch my-branch to 68fdae89de4f
+    Dry-run requested, not pushing.
+    "###);
+}
+
 #[test]
 fn test_git_push_missing_committer() {
     let (test_env, workspace_root) = set_up();
@@ -899,6 +976,45 @@ fn test_git_push_missing_committer() {
     "###);
 }
 
+#[test]
+fn test_git_push_missing_committer_in_immutable() {
+    let (test_env, workspace_root) = set_up();
+    let run_without_var = |var: &str, args: &[&str]| {
+        test_env
+            .jj_cmd(&workspace_root, args)
+            .env_remove(var)
+            .assert()
+            .success();
+    };
+    run_without_var("JJ_USER", &["describe", "-m=no committer name"]);
+    test_env.jj_cmd_ok(&workspace_root, &["new"]);
+    run_without_var("JJ_EMAIL", &["describe", "-m=no committer email"]);
+    test_env.jj_cmd_ok(&workspace_root, &["branch", "create", "imm"]);
+    test_env.jj_cmd_ok(&workspace_root, &["new", "-m", "foo"]);
+    std::fs::write(workspace_root.join("file"), "contents").unwrap();
+    test_env.jj_cmd_ok(&workspace_root, &["branch", "create", "my-branch"]);
+
+    let stderr = test_env.jj_cmd_failure(
+        &workspace_root,
+        &["git", "push", "--branch=my-branch", "--dry-run"],
+    );
+    insta::assert_snapshot!(stderr, @r###"
+    Error: Won't push commit 7e61dc727a8f since it has no author and/or committer set
+    "###);
+
+    test_env.add_config(r#"revset-aliases."immutable_heads()" = "imm""#);
+    let (stdout, stderr) = test_env.jj_cmd_ok(
+        &workspace_root,
+        &["git", "push", "--branch=my-branch", "--dry-run"],
+    );
+    insta::assert_snapshot!(stdout, @"");
+    insta::assert_snapshot!(stderr, @r###"
+    Branch changes to push to origin:
+      Add branch my-branch to c79f85e90b4a
+    Dry-run requested, not pushing.
+    "###);
+}
+
 #[test]
 fn test_git_push_deleted() {
     let (test_env, workspace_root) = set_up();
diff --git a/cli/tests/test_git_remotes.rs b/cli/tests/test_git_remotes.rs
index 5f6194fdae..9987a5e1b1 100644
--- a/cli/tests/test_git_remotes.rs
+++ b/cli/tests/test_git_remotes.rs
@@ -90,6 +90,60 @@ fn test_git_remote_add() {
     "###);
 }
 
+#[test]
+fn test_git_remote_set_url() {
+    let test_env = TestEnvironment::default();
+
+    test_env.jj_cmd_ok(test_env.env_root(), &["git", "init", "repo"]);
+    let repo_path = test_env.env_root().join("repo");
+    test_env.jj_cmd_ok(
+        &repo_path,
+        &["git", "remote", "add", "foo", "http://example.com/repo/foo"],
+    );
+    let stderr = test_env.jj_cmd_failure(
+        &repo_path,
+        &[
+            "git",
+            "remote",
+            "set-url",
+            "bar",
+            "http://example.com/repo/bar",
+        ],
+    );
+    insta::assert_snapshot!(stderr, @r###"
+    Error: No git remote named 'bar'
+    "###);
+    let stderr = test_env.jj_cmd_failure(
+        &repo_path,
+        &[
+            "git",
+            "remote",
+            "set-url",
+            "git",
+            "http://example.com/repo/git",
+        ],
+    );
+    insta::assert_snapshot!(stderr, @r###"
+    Error: Git remote named 'git' is reserved for local Git repository
+    "###);
+    let (stdout, stderr) = test_env.jj_cmd_ok(
+        &repo_path,
+        &[
+            "git",
+            "remote",
+            "set-url",
+            "foo",
+            "http://example.com/repo/bar",
+        ],
+    );
+    insta::assert_snapshot!(stdout, @"");
+    insta::assert_snapshot!(stderr, @"");
+    let stdout = test_env.jj_cmd_success(&repo_path, &["git", "remote", "list"]);
+    insta::assert_snapshot!(stdout, @r###"
+    foo http://example.com/repo/bar
+    "###);
+}
+
 #[test]
 fn test_git_remote_rename() {
     let test_env = TestEnvironment::default();
diff --git a/cli/tests/test_global_opts.rs b/cli/tests/test_global_opts.rs
index 5639de0bf5..2402c34207 100644
--- a/cli/tests/test_global_opts.rs
+++ b/cli/tests/test_global_opts.rs
@@ -236,7 +236,7 @@ fn test_bad_path() {
     test_env.add_config("ui.allow-filesets = true");
 
     // cwd == workspace_root
-    let stderr = test_env.jj_cmd_failure(&repo_path, &["cat", "../out"]);
+    let stderr = test_env.jj_cmd_failure(&repo_path, &["file", "show", "../out"]);
     insta::assert_snapshot!(stderr.replace('\\', "/"), @r###"
     Error: Failed to parse fileset: Invalid file pattern
     Caused by:
@@ -251,7 +251,7 @@ fn test_bad_path() {
     "###);
 
     // cwd != workspace_root, can't be parsed as repo-relative path
-    let stderr = test_env.jj_cmd_failure(&subdir, &["cat", "../.."]);
+    let stderr = test_env.jj_cmd_failure(&subdir, &["file", "show", "../.."]);
     insta::assert_snapshot!(stderr.replace('\\', "/"), @r###"
     Error: Failed to parse fileset: Invalid file pattern
     Caused by:
@@ -266,7 +266,7 @@ fn test_bad_path() {
     "###);
 
     // cwd != workspace_root, can be parsed as repo-relative path
-    let stderr = test_env.jj_cmd_failure(test_env.env_root(), &["cat", "-Rrepo", "out"]);
+    let stderr = test_env.jj_cmd_failure(test_env.env_root(), &["file", "show", "-Rrepo", "out"]);
     insta::assert_snapshot!(stderr.replace('\\', "/"), @r###"
     Error: Failed to parse fileset: Invalid file pattern
     Caused by:
@@ -284,7 +284,7 @@ fn test_bad_path() {
     test_env.add_config("ui.allow-filesets = false");
 
     // If fileset/pattern syntax is disabled, no hint should be generated
-    let stderr = test_env.jj_cmd_failure(test_env.env_root(), &["cat", "-Rrepo", "out"]);
+    let stderr = test_env.jj_cmd_failure(test_env.env_root(), &["file", "show", "-Rrepo", "out"]);
     insta::assert_snapshot!(stderr.replace('\\', "/"), @r###"
     Error: Path "out" is not in the repo "repo"
     Caused by: Invalid component ".." in repo-relative path "../out"
diff --git a/cli/tests/test_immutable_commits.rs b/cli/tests/test_immutable_commits.rs
index 8a3bbf017c..44a41245e5 100644
--- a/cli/tests/test_immutable_commits.rs
+++ b/cli/tests/test_immutable_commits.rs
@@ -95,17 +95,11 @@ fn test_rewrite_immutable_generic() {
     Parent commit      : kkmpptxz c8d4c7ca main | b
     "###);
 
-    // Error if we redefine immutable_heads() with an argument
+    // immutable_heads() of different arity doesn't shadow the 0-ary one
     test_env.add_config(r#"revset-aliases."immutable_heads(foo)" = "none()""#);
     let stderr = test_env.jj_cmd_failure(&repo_path, &["edit", "root()"]);
     insta::assert_snapshot!(stderr, @r###"
-    Error: The `revset-aliases.immutable_heads()` function must be declared without arguments
-    "###);
-    // ... even if we also update the built-in call sites
-    test_env.add_config(r#"revsets.short-prefixes = "immutable_heads(root())""#);
-    let stderr = test_env.jj_cmd_failure(&repo_path, &["edit", "root()"]);
-    insta::assert_snapshot!(stderr, @r###"
-    Error: The `revset-aliases.immutable_heads()` function must be declared without arguments
+    Error: The root commit 000000000000 is immutable
     "###);
 }
 
@@ -210,7 +204,7 @@ fn test_rewrite_immutable_commands() {
     Hint: Pass `--ignore-immutable` or configure the set of immutable commits via `revset-aliases.immutable_heads()`.
     "###);
     // chmod
-    let stderr = test_env.jj_cmd_failure(&repo_path, &["chmod", "-r=main", "x", "file"]);
+    let stderr = test_env.jj_cmd_failure(&repo_path, &["file", "chmod", "-r=main", "x", "file"]);
     insta::assert_snapshot!(stderr, @r###"
     Error: Commit 3e0250828ca5 is immutable
     Hint: Pass `--ignore-immutable` or configure the set of immutable commits via `revset-aliases.immutable_heads()`.
diff --git a/cli/tests/test_move_command.rs b/cli/tests/test_move_command.rs
index 1e30470c13..664103a7ab 100644
--- a/cli/tests/test_move_command.rs
+++ b/cli/tests/test_move_command.rs
@@ -103,12 +103,12 @@ fn test_move() {
     ◉  000000000000
     "###);
     // The change from the source has been applied
-    let stdout = test_env.jj_cmd_success(&repo_path, &["print", "file1"]);
+    let stdout = test_env.jj_cmd_success(&repo_path, &["file", "show", "file1"]);
     insta::assert_snapshot!(stdout, @r###"
     c
     "###);
     // File `file2`, which was not changed in source, is unchanged
-    let stdout = test_env.jj_cmd_success(&repo_path, &["print", "file2"]);
+    let stdout = test_env.jj_cmd_success(&repo_path, &["file", "show", "file2"]);
     insta::assert_snapshot!(stdout, @r###"
     f
     "###);
@@ -136,7 +136,7 @@ fn test_move() {
     "###);
     // The change from the source has been applied (the file contents were already
     // "f", as is typically the case when moving changes from an ancestor)
-    let stdout = test_env.jj_cmd_success(&repo_path, &["print", "file2"]);
+    let stdout = test_env.jj_cmd_success(&repo_path, &["file", "show", "file2"]);
     insta::assert_snapshot!(stdout, @r###"
     f
     "###);
@@ -164,7 +164,7 @@ fn test_move() {
     ◉  000000000000
     "###);
     // The change from the source has been applied
-    let stdout = test_env.jj_cmd_success(&repo_path, &["print", "file2", "-r", "d"]);
+    let stdout = test_env.jj_cmd_success(&repo_path, &["file", "show", "file2", "-r", "d"]);
     insta::assert_snapshot!(stdout, @r###"
     e
     "###);
@@ -227,16 +227,16 @@ fn test_move_partial() {
     ◉  000000000000
     "###);
     // The changes from the source has been applied
-    let stdout = test_env.jj_cmd_success(&repo_path, &["print", "file1"]);
+    let stdout = test_env.jj_cmd_success(&repo_path, &["file", "show", "file1"]);
     insta::assert_snapshot!(stdout, @r###"
     c
     "###);
-    let stdout = test_env.jj_cmd_success(&repo_path, &["print", "file2"]);
+    let stdout = test_env.jj_cmd_success(&repo_path, &["file", "show", "file2"]);
     insta::assert_snapshot!(stdout, @r###"
     c
     "###);
     // File `file3`, which was not changed in source, is unchanged
-    let stdout = test_env.jj_cmd_success(&repo_path, &["print", "file3"]);
+    let stdout = test_env.jj_cmd_success(&repo_path, &["file", "show", "file3"]);
     insta::assert_snapshot!(stdout, @r###"
     d
     "###);
@@ -262,17 +262,17 @@ fn test_move_partial() {
     ◉  000000000000
     "###);
     // The selected change from the source has been applied
-    let stdout = test_env.jj_cmd_success(&repo_path, &["print", "file1"]);
+    let stdout = test_env.jj_cmd_success(&repo_path, &["file", "show", "file1"]);
     insta::assert_snapshot!(stdout, @r###"
     c
     "###);
     // The unselected change from the source has not been applied
-    let stdout = test_env.jj_cmd_success(&repo_path, &["print", "file2"]);
+    let stdout = test_env.jj_cmd_success(&repo_path, &["file", "show", "file2"]);
     insta::assert_snapshot!(stdout, @r###"
     a
     "###);
     // File `file3`, which was changed in source's parent, is unchanged
-    let stdout = test_env.jj_cmd_success(&repo_path, &["print", "file3"]);
+    let stdout = test_env.jj_cmd_success(&repo_path, &["file", "show", "file3"]);
     insta::assert_snapshot!(stdout, @r###"
     d
     "###);
@@ -299,17 +299,17 @@ fn test_move_partial() {
     ◉  000000000000
     "###);
     // The selected change from the source has been applied
-    let stdout = test_env.jj_cmd_success(&repo_path, &["print", "file1"]);
+    let stdout = test_env.jj_cmd_success(&repo_path, &["file", "show", "file1"]);
     insta::assert_snapshot!(stdout, @r###"
     c
     "###);
     // The unselected change from the source has not been applied
-    let stdout = test_env.jj_cmd_success(&repo_path, &["print", "file2"]);
+    let stdout = test_env.jj_cmd_success(&repo_path, &["file", "show", "file2"]);
     insta::assert_snapshot!(stdout, @r###"
     a
     "###);
     // File `file3`, which was changed in source's parent, is unchanged
-    let stdout = test_env.jj_cmd_success(&repo_path, &["print", "file3"]);
+    let stdout = test_env.jj_cmd_success(&repo_path, &["file", "show", "file3"]);
     insta::assert_snapshot!(stdout, @r###"
     d
     "###);
@@ -335,12 +335,12 @@ fn test_move_partial() {
     ◉  000000000000
     "###);
     // The selected change from the source has been applied
-    let stdout = test_env.jj_cmd_success(&repo_path, &["print", "file1", "-r", "b"]);
+    let stdout = test_env.jj_cmd_success(&repo_path, &["file", "show", "file1", "-r", "b"]);
     insta::assert_snapshot!(stdout, @r###"
     c
     "###);
     // The unselected change from the source has not been applied
-    let stdout = test_env.jj_cmd_success(&repo_path, &["print", "file2", "-r", "b"]);
+    let stdout = test_env.jj_cmd_success(&repo_path, &["file", "show", "file2", "-r", "b"]);
     insta::assert_snapshot!(stdout, @r###"
     a
     "###);
diff --git a/cli/tests/test_new_command.rs b/cli/tests/test_new_command.rs
index d77e555bf5..771d62a552 100644
--- a/cli/tests/test_new_command.rs
+++ b/cli/tests/test_new_command.rs
@@ -85,9 +85,9 @@ fn test_new_merge() {
     ├─╯
     ◉  0000000000000000000000000000000000000000
     "###);
-    let stdout = test_env.jj_cmd_success(&repo_path, &["print", "file1"]);
+    let stdout = test_env.jj_cmd_success(&repo_path, &["file", "show", "file1"]);
     insta::assert_snapshot!(stdout, @"a");
-    let stdout = test_env.jj_cmd_success(&repo_path, &["print", "file2"]);
+    let stdout = test_env.jj_cmd_success(&repo_path, &["file", "show", "file2"]);
     insta::assert_snapshot!(stdout, @"b");
 
     // Same test with `--no-edit`
diff --git a/cli/tests/test_next_prev_commands.rs b/cli/tests/test_next_prev_commands.rs
index 36d2582fce..00d674f41c 100644
--- a/cli/tests/test_next_prev_commands.rs
+++ b/cli/tests/test_next_prev_commands.rs
@@ -567,7 +567,172 @@ fn test_next_editing() {
     "###);
 }
 
+#[test]
+fn test_prev_conflict() {
+    // Make the first commit our new parent.
+    let test_env = TestEnvironment::default();
+    test_env.jj_cmd_ok(test_env.env_root(), &["init", "repo", "--git"]);
+    let repo_path = test_env.env_root().join("repo");
+    let file_path = repo_path.join("content.txt");
+    std::fs::write(&file_path, "first").unwrap();
+    test_env.jj_cmd_ok(&repo_path, &["commit", "-m", "first"]);
+    std::fs::write(&file_path, "second").unwrap();
+    test_env.jj_cmd_ok(&repo_path, &["commit", "-m", "second"]);
+    test_env.jj_cmd_ok(&repo_path, &["commit", "-m", "third"]);
+    // Create a conflict in the first commit, where we'll jump to.
+    test_env.jj_cmd_ok(&repo_path, &["edit", "description(first)"]);
+    std::fs::write(&file_path, "first+1").unwrap();
+    test_env.jj_cmd_ok(&repo_path, &["new", "description(third)"]);
+    test_env.jj_cmd_ok(&repo_path, &["commit", "-m", "fourth"]);
+    // Test the setup
+    insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###"
+    @  yqosqzytrlsw conflict
+    ◉  royxmykxtrkr conflict fourth
+    ◉  kkmpptxzrspx conflict third
+    ◉  rlvkpnrzqnoo conflict second
+    ◉  qpvuntsmwlqt first
+    ◉  zzzzzzzzzzzz
+    "###);
+    test_env.jj_cmd_ok(&repo_path, &["prev", "--conflict"]);
+    insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###"
+    @  yostqsxwqrlt conflict
+    │ ◉  royxmykxtrkr conflict fourth
+    ├─╯
+    ◉  kkmpptxzrspx conflict third
+    ◉  rlvkpnrzqnoo conflict second
+    ◉  qpvuntsmwlqt first
+    ◉  zzzzzzzzzzzz
+    "###);
+}
+
+#[test]
+fn test_prev_conflict_editing() {
+    // Edit the third commit.
+    let test_env = TestEnvironment::default();
+    test_env.jj_cmd_ok(test_env.env_root(), &["init", "repo", "--git"]);
+    let repo_path = test_env.env_root().join("repo");
+    let file_path = repo_path.join("content.txt");
+    test_env.jj_cmd_ok(&repo_path, &["commit", "-m", "first"]);
+    test_env.jj_cmd_ok(&repo_path, &["commit", "-m", "second"]);
+    std::fs::write(&file_path, "second").unwrap();
+    test_env.jj_cmd_ok(&repo_path, &["commit", "-m", "third"]);
+    // Create a conflict in the third commit, where we'll jump to.
+    test_env.jj_cmd_ok(&repo_path, &["edit", "description(first)"]);
+    std::fs::write(&file_path, "first text").unwrap();
+    test_env.jj_cmd_ok(&repo_path, &["new", "description(third)"]);
+    // Test the setup
+    insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###"
+    @  royxmykxtrkr conflict
+    ◉  kkmpptxzrspx conflict third
+    ◉  rlvkpnrzqnoo second
+    ◉  qpvuntsmwlqt first
+    ◉  zzzzzzzzzzzz
+    "###);
+    test_env.jj_cmd_ok(&repo_path, &["prev", "--conflict", "--edit"]);
+    // We now should be editing the third commit.
+    insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###"
+    @  kkmpptxzrspx conflict third
+    ◉  rlvkpnrzqnoo second
+    ◉  qpvuntsmwlqt first
+    ◉  zzzzzzzzzzzz
+    "###);
+}
+
+#[test]
+fn test_next_conflict() {
+    // There is a conflict in the third commit, so after next it should be the new
+    // parent.
+    let test_env = TestEnvironment::default();
+    test_env.jj_cmd_ok(test_env.env_root(), &["init", "repo", "--git"]);
+    let repo_path = test_env.env_root().join("repo");
+    let file_path = repo_path.join("content.txt");
+    std::fs::write(&file_path, "first").unwrap();
+    test_env.jj_cmd_ok(&repo_path, &["commit", "-m", "first"]);
+    test_env.jj_cmd_ok(&repo_path, &["commit", "-m", "second"]);
+    // Create a conflict in the third commit.
+    std::fs::write(&file_path, "third").unwrap();
+    test_env.jj_cmd_ok(&repo_path, &["commit", "-m", "third"]);
+    test_env.jj_cmd_ok(&repo_path, &["new", "description(first)"]);
+    std::fs::write(&file_path, "first v2").unwrap();
+    test_env.jj_cmd_ok(&repo_path, &["squash", "--into", "description(third)"]);
+    // Test the setup
+    insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###"
+    @  royxmykxtrkr
+    │ ◉  kkmpptxzrspx conflict third
+    │ ◉  rlvkpnrzqnoo second
+    ├─╯
+    ◉  qpvuntsmwlqt first
+    ◉  zzzzzzzzzzzz
+    "###);
+    test_env.jj_cmd_ok(&repo_path, &["next", "--conflict"]);
+    insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###"
+    @  vruxwmqvtpmx conflict
+    ◉  kkmpptxzrspx conflict third
+    ◉  rlvkpnrzqnoo second
+    ◉  qpvuntsmwlqt first
+    ◉  zzzzzzzzzzzz
+    "###);
+}
+
+#[test]
+fn test_next_conflict_editing() {
+    // There is a conflict in the third commit, so after next it should be our
+    // working copy.
+    let test_env = TestEnvironment::default();
+    test_env.jj_cmd_ok(test_env.env_root(), &["init", "repo", "--git"]);
+    let repo_path = test_env.env_root().join("repo");
+    let file_path = repo_path.join("content.txt");
+    test_env.jj_cmd_ok(&repo_path, &["commit", "-m", "first"]);
+    std::fs::write(&file_path, "second").unwrap();
+    test_env.jj_cmd_ok(&repo_path, &["commit", "-m", "second"]);
+    // Create a conflict in the third commit.
+    std::fs::write(&file_path, "third").unwrap();
+    test_env.jj_cmd_ok(&repo_path, &["edit", "description(second)"]);
+    std::fs::write(&file_path, "modified second").unwrap();
+    test_env.jj_cmd_ok(&repo_path, &["edit", "@-"]);
+    // Test the setup
+    insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###"
+    ◉  kkmpptxzrspx conflict
+    ◉  rlvkpnrzqnoo second
+    @  qpvuntsmwlqt first
+    ◉  zzzzzzzzzzzz
+    "###);
+    test_env.jj_cmd_ok(&repo_path, &["next", "--conflict", "--edit"]);
+    insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###"
+    @  kkmpptxzrspx conflict
+    ◉  rlvkpnrzqnoo second
+    ◉  qpvuntsmwlqt first
+    ◉  zzzzzzzzzzzz
+    "###);
+}
+
+#[test]
+fn test_next_conflict_head() {
+    // When editing a head with conflicts, `jj next --conflict [--edit]` errors out.
+    let test_env = TestEnvironment::default();
+    test_env.jj_cmd_ok(test_env.env_root(), &["init", "repo", "--git"]);
+    let repo_path = test_env.env_root().join("repo");
+    let file_path = repo_path.join("file");
+    std::fs::write(&file_path, "first").unwrap();
+    test_env.jj_cmd_ok(&repo_path, &["new"]);
+    std::fs::write(&file_path, "second").unwrap();
+    test_env.jj_cmd_ok(&repo_path, &["abandon", "@-"]);
+    // Test the setup
+    insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###"
+    @  rlvkpnrzqnoo conflict
+    ◉  zzzzzzzzzzzz
+    "###);
+    let stderr = test_env.jj_cmd_failure(&repo_path, &["next", "--conflict"]);
+    insta::assert_snapshot!(stderr, @r###"
+    Error: No descendant found 1 commit forward
+    "###);
+    let stderr = test_env.jj_cmd_failure(&repo_path, &["next", "--conflict", "--edit"]);
+    insta::assert_snapshot!(stderr, @r###"
+    Error: No descendant found 1 commit forward
+    "###);
+}
+
 fn get_log_output(test_env: &TestEnvironment, cwd: &Path) -> String {
-    let template = r#"separate(" ", change_id.short(), local_branches, description)"#;
+    let template = r#"separate(" ", change_id.short(), local_branches, if(conflict, "conflict"), description)"#;
     test_env.jj_cmd_success(cwd, &["log", "-T", template])
 }
diff --git a/cli/tests/test_operations.rs b/cli/tests/test_operations.rs
index 44b22d071b..5b140adf89 100644
--- a/cli/tests/test_operations.rs
+++ b/cli/tests/test_operations.rs
@@ -381,7 +381,7 @@ fn test_op_abandon_ancestors() {
     Abandoned 3 operations and reparented 1 descendant operations.
     "###);
     insta::assert_snapshot!(
-        test_env.jj_cmd_success(&repo_path, &["debug", "workingcopy", "--ignore-working-copy"]), @r###"
+        test_env.jj_cmd_success(&repo_path, &["debug", "local-working-copy", "--ignore-working-copy"]), @r###"
     Current operation: OperationId("10e856d0579c4aca88972ffea0a515f47f8c09dceaa2b1a5d531c83b04350f7aa64a3eff422def01eebd65df26089ef5e0f925f247a8f929c8cc858d16306e53")
     Current tree: Merge(Resolved(TreeId("4b825dc642cb6eb9a060e54bf8d69288fbee4904")))
     "###);
@@ -430,7 +430,7 @@ fn test_op_abandon_ancestors() {
     Abandoned 1 operations and reparented 1 descendant operations.
     "###);
     insta::assert_snapshot!(
-        test_env.jj_cmd_success(&repo_path, &["debug", "workingcopy", "--ignore-working-copy"]), @r###"
+        test_env.jj_cmd_success(&repo_path, &["debug", "local-working-copy", "--ignore-working-copy"]), @r###"
     Current operation: OperationId("445e93662d714f53fb97e450eb3793a8e1a9a4cca1e329d5a9096e65085fb96d5bb51659531145c8abf0db5da803cd11c4cecdcf9025391bc97fc6a42204a0fe")
     Current tree: Merge(Resolved(TreeId("4b825dc642cb6eb9a060e54bf8d69288fbee4904")))
     "###);
@@ -449,7 +449,7 @@ fn test_op_abandon_ancestors() {
     insta::assert_snapshot!(stderr, @r###"
     Nothing changed.
     "###);
-    insta::assert_snapshot!(test_env.jj_cmd_success(&repo_path, &["op", "log", "-l1"]), @r###"
+    insta::assert_snapshot!(test_env.jj_cmd_success(&repo_path, &["op", "log", "-n1"]), @r###"
     @  445e93662d71 test-username@host.example.com 2001-02-03 04:05:21.000 +07:00 - 2001-02-03 04:05:21.000 +07:00
     │  undo operation 70112b4447b65fa811038b2b119fe22e959e3b3194b461a32475f6528c2b684ac6baebc86cce7ad7e0bb92c033852850e561506508ca43e823626f107e81ed76
     │  args: jj undo
@@ -475,12 +475,12 @@ fn test_op_abandon_without_updating_working_copy() {
     Abandoned 1 operations and reparented 1 descendant operations.
     "###);
     insta::assert_snapshot!(
-        test_env.jj_cmd_success(&repo_path, &["debug", "workingcopy", "--ignore-working-copy"]), @r###"
+        test_env.jj_cmd_success(&repo_path, &["debug", "local-working-copy", "--ignore-working-copy"]), @r###"
     Current operation: OperationId("61aeade2493b190412c61b9b0711025c2cccf95966870a5f7dc2e34ab313fbef64da70d00cab2cd69ad39816faeb80a6bc866927549b84dce6cb5a437e0e515b")
     Current tree: Merge(Resolved(TreeId("4b825dc642cb6eb9a060e54bf8d69288fbee4904")))
     "###);
     insta::assert_snapshot!(
-        test_env.jj_cmd_success(&repo_path, &["op", "log", "-l1", "--ignore-working-copy"]), @r###"
+        test_env.jj_cmd_success(&repo_path, &["op", "log", "-n1", "--ignore-working-copy"]), @r###"
     @  ae6364994418 test-username@host.example.com 2001-02-03 04:05:10.000 +07:00 - 2001-02-03 04:05:10.000 +07:00
     │  commit 268f5f16139313ff25bef31280b2ec2e675200f3
     │  args: jj commit -m 'commit 3'
@@ -495,12 +495,12 @@ fn test_op_abandon_without_updating_working_copy() {
     Warning: The working copy operation 61aeade2493b is not updated because it differs from the repo ae6364994418.
     "###);
     insta::assert_snapshot!(
-        test_env.jj_cmd_success(&repo_path, &["debug", "workingcopy", "--ignore-working-copy"]), @r###"
+        test_env.jj_cmd_success(&repo_path, &["debug", "local-working-copy", "--ignore-working-copy"]), @r###"
     Current operation: OperationId("61aeade2493b190412c61b9b0711025c2cccf95966870a5f7dc2e34ab313fbef64da70d00cab2cd69ad39816faeb80a6bc866927549b84dce6cb5a437e0e515b")
     Current tree: Merge(Resolved(TreeId("4b825dc642cb6eb9a060e54bf8d69288fbee4904")))
     "###);
     insta::assert_snapshot!(
-        test_env.jj_cmd_success(&repo_path, &["op", "log", "-l1", "--ignore-working-copy"]), @r###"
+        test_env.jj_cmd_success(&repo_path, &["op", "log", "-n1", "--ignore-working-copy"]), @r###"
     @  51192a90e899 test-username@host.example.com 2001-02-03 04:05:10.000 +07:00 - 2001-02-03 04:05:10.000 +07:00
     │  commit 268f5f16139313ff25bef31280b2ec2e675200f3
     │  args: jj commit -m 'commit 3'
diff --git a/cli/tests/test_resolve_command.rs b/cli/tests/test_resolve_command.rs
index 6eb9204714..942f9622e2 100644
--- a/cli/tests/test_resolve_command.rs
+++ b/cli/tests/test_resolve_command.rs
@@ -355,6 +355,7 @@ fn test_resolution() {
 fn check_resolve_produces_input_file(
     test_env: &mut TestEnvironment,
     repo_path: &Path,
+    filename: &str,
     role: &str,
     expected_content: &str,
 ) {
@@ -368,10 +369,15 @@ fn check_resolve_produces_input_file(
     // https://github.com/mitsuhiko/insta/commit/745b45b. Hopefully, this will again become possible
     // in the future. See also https://github.com/mitsuhiko/insta/issues/313.
     assert_eq!(
-        &test_env.jj_cmd_failure(repo_path, &["resolve", "--config-toml", &merge_arg_config]),
-        "Resolving conflicts in: file\nError: Failed to resolve conflicts\nCaused by: The output \
-         file is either unchanged or empty after the editor quit (run with --debug to see the \
-         exact invocation).\n"
+        test_env.jj_cmd_failure(
+            repo_path,
+            &["resolve", "--config-toml", &merge_arg_config, filename]
+        ),
+        format!(
+            "Resolving conflicts in: {filename}\nError: Failed to resolve conflicts\nCaused by: \
+             The output file is either unchanged or empty after the editor quit (run with --debug \
+             to see the exact invocation).\n"
+        )
     );
 }
 
@@ -411,9 +417,9 @@ fn test_normal_conflict_input_files() {
     >>>>>>> Conflict 1 of 1 ends
     "###);
 
-    check_resolve_produces_input_file(&mut test_env, &repo_path, "base", "base\n");
-    check_resolve_produces_input_file(&mut test_env, &repo_path, "left", "a\n");
-    check_resolve_produces_input_file(&mut test_env, &repo_path, "right", "b\n");
+    check_resolve_produces_input_file(&mut test_env, &repo_path, "file", "base", "base\n");
+    check_resolve_produces_input_file(&mut test_env, &repo_path, "file", "left", "a\n");
+    check_resolve_produces_input_file(&mut test_env, &repo_path, "file", "right", "b\n");
 }
 
 #[test]
@@ -451,9 +457,9 @@ fn test_baseless_conflict_input_files() {
     >>>>>>> Conflict 1 of 1 ends
     "###);
 
-    check_resolve_produces_input_file(&mut test_env, &repo_path, "base", "");
-    check_resolve_produces_input_file(&mut test_env, &repo_path, "left", "a\n");
-    check_resolve_produces_input_file(&mut test_env, &repo_path, "right", "b\n");
+    check_resolve_produces_input_file(&mut test_env, &repo_path, "file", "base", "");
+    check_resolve_produces_input_file(&mut test_env, &repo_path, "file", "left", "a\n");
+    check_resolve_produces_input_file(&mut test_env, &repo_path, "file", "right", "b\n");
 }
 
 #[test]
@@ -486,6 +492,137 @@ fn test_too_many_parents() {
     "###);
 }
 
+#[test]
+fn test_simplify_conflict_sides() {
+    let mut test_env = TestEnvironment::default();
+    test_env.jj_cmd_ok(test_env.env_root(), &["git", "init", "repo"]);
+    let repo_path = test_env.env_root().join("repo");
+
+    // Creates a 4-sided conflict, with fileA and fileB having different conflicts:
+    // fileA: A - B + C - B + B - B + B
+    // fileB: A - A + A - A + B - C + D
+    create_commit(
+        &test_env,
+        &repo_path,
+        "base",
+        &[],
+        &[("fileA", "base\n"), ("fileB", "base\n")],
+    );
+    create_commit(&test_env, &repo_path, "a1", &["base"], &[("fileA", "1\n")]);
+    create_commit(&test_env, &repo_path, "a2", &["base"], &[("fileA", "2\n")]);
+    create_commit(&test_env, &repo_path, "b1", &["base"], &[("fileB", "1\n")]);
+    create_commit(&test_env, &repo_path, "b2", &["base"], &[("fileB", "2\n")]);
+    create_commit(&test_env, &repo_path, "conflictA", &["a1", "a2"], &[]);
+    create_commit(&test_env, &repo_path, "conflictB", &["b1", "b2"], &[]);
+    create_commit(
+        &test_env,
+        &repo_path,
+        "conflict",
+        &["conflictA", "conflictB"],
+        &[],
+    );
+
+    // Even though the tree-level conflict is a 4-sided conflict, each file is
+    // materialized as a 2-sided conflict.
+    insta::assert_snapshot!(test_env.jj_cmd_success(&repo_path, &["debug", "tree"]),
+    @r###"
+    fileA: Ok(Conflicted([Some(File { id: FileId("d00491fd7e5bb6fa28c517a0bb32b8b506539d4d"), executable: false }), Some(File { id: FileId("df967b96a579e45a18b8251732d16804b2e56a55"), executable: false }), Some(File { id: FileId("0cfbf08886fca9a91cb753ec8734c84fcbe52c9f"), executable: false }), Some(File { id: FileId("df967b96a579e45a18b8251732d16804b2e56a55"), executable: false }), Some(File { id: FileId("df967b96a579e45a18b8251732d16804b2e56a55"), executable: false }), Some(File { id: FileId("df967b96a579e45a18b8251732d16804b2e56a55"), executable: false }), Some(File { id: FileId("df967b96a579e45a18b8251732d16804b2e56a55"), executable: false })]))
+    fileB: Ok(Conflicted([Some(File { id: FileId("df967b96a579e45a18b8251732d16804b2e56a55"), executable: false }), Some(File { id: FileId("df967b96a579e45a18b8251732d16804b2e56a55"), executable: false }), Some(File { id: FileId("df967b96a579e45a18b8251732d16804b2e56a55"), executable: false }), Some(File { id: FileId("df967b96a579e45a18b8251732d16804b2e56a55"), executable: false }), Some(File { id: FileId("d00491fd7e5bb6fa28c517a0bb32b8b506539d4d"), executable: false }), Some(File { id: FileId("df967b96a579e45a18b8251732d16804b2e56a55"), executable: false }), Some(File { id: FileId("0cfbf08886fca9a91cb753ec8734c84fcbe52c9f"), executable: false })]))
+    "###);
+    insta::assert_snapshot!(test_env.jj_cmd_success(&repo_path, &["resolve", "--list"]),
+    @r###"
+    fileA    2-sided conflict
+    fileB    2-sided conflict
+    "###);
+    insta::assert_snapshot!(
+    std::fs::read_to_string(repo_path.join("fileA")).unwrap(), @r###"
+    <<<<<<< Conflict 1 of 1
+    %%%%%%% Changes from base to side #1
+    -base
+    +1
+    +++++++ Contents of side #2
+    2
+    >>>>>>> Conflict 1 of 1 ends
+    "###);
+    insta::assert_snapshot!(
+    std::fs::read_to_string(repo_path.join("fileB")).unwrap(), @r###"
+    <<<<<<< Conflict 1 of 1
+    %%%%%%% Changes from base to side #1
+    -base
+    +1
+    +++++++ Contents of side #2
+    2
+    >>>>>>> Conflict 1 of 1 ends
+    "###);
+
+    // Conflict should be simplified before being handled by external merge tool.
+    check_resolve_produces_input_file(&mut test_env, &repo_path, "fileA", "base", "base\n");
+    check_resolve_produces_input_file(&mut test_env, &repo_path, "fileA", "left", "1\n");
+    check_resolve_produces_input_file(&mut test_env, &repo_path, "fileA", "right", "2\n");
+    check_resolve_produces_input_file(&mut test_env, &repo_path, "fileB", "base", "base\n");
+    check_resolve_produces_input_file(&mut test_env, &repo_path, "fileB", "left", "1\n");
+    check_resolve_produces_input_file(&mut test_env, &repo_path, "fileB", "right", "2\n");
+
+    // Check that simplified conflicts are still parsed as conflicts after editing
+    // when `merge-tool-edits-conflict-markers=true`.
+    let editor_script = test_env.set_up_fake_editor();
+    std::fs::write(
+        editor_script,
+        indoc! {"
+            write
+            <<<<<<< Conflict 1 of 1
+            %%%%%%% Changes from base to side #1
+            -base_edited
+            +1_edited
+            +++++++ Contents of side #2
+            2_edited
+            >>>>>>> Conflict 1 of 1 ends
+        "},
+    )
+    .unwrap();
+    let (stdout, stderr) = test_env.jj_cmd_ok(
+        &repo_path,
+        &[
+            "resolve",
+            "--config-toml",
+            "merge-tools.fake-editor.merge-tool-edits-conflict-markers=true",
+            "fileB",
+        ],
+    );
+    insta::assert_snapshot!(stdout, @"");
+    insta::assert_snapshot!(stderr, @r###"
+    Resolving conflicts in: fileB
+    New conflicts appeared in these commits:
+      nkmrtpmo 4b14662a conflict | (conflict) conflict
+    To resolve the conflicts, start by updating to it:
+      jj new nkmrtpmomlro
+    Then use `jj resolve`, or edit the conflict markers in the file directly.
+    Once the conflicts are resolved, you may want inspect the result with `jj diff`.
+    Then run `jj squash` to move the resolution into the conflicted commit.
+    Working copy now at: nkmrtpmo 4b14662a conflict | (conflict) conflict
+    Parent commit      : kmkuslsw 18c1fb00 conflictA | (conflict) (empty) conflictA
+    Parent commit      : lylxulpl d11c92eb conflictB | (conflict) (empty) conflictB
+    Added 0 files, modified 1 files, removed 0 files
+    There are unresolved conflicts at these paths:
+    fileA    2-sided conflict
+    fileB    2-sided conflict
+    "###);
+    insta::assert_snapshot!(std::fs::read_to_string(repo_path.join("fileB")).unwrap(), @r###"
+    <<<<<<< Conflict 1 of 1
+    %%%%%%% Changes from base to side #1
+    -base_edited
+    +1_edited
+    +++++++ Contents of side #2
+    2_edited
+    >>>>>>> Conflict 1 of 1 ends
+    "###);
+    insta::assert_snapshot!(test_env.jj_cmd_success(&repo_path, &["resolve", "--list"]),
+    @r###"
+    fileA    2-sided conflict
+    fileB    2-sided conflict
+    "###);
+}
+
 #[test]
 fn test_edit_delete_conflict_input_files() {
     let mut test_env = TestEnvironment::default();
@@ -522,9 +659,9 @@ fn test_edit_delete_conflict_input_files() {
     >>>>>>> Conflict 1 of 1 ends
     "###);
 
-    check_resolve_produces_input_file(&mut test_env, &repo_path, "base", "base\n");
-    check_resolve_produces_input_file(&mut test_env, &repo_path, "left", "a\n");
-    check_resolve_produces_input_file(&mut test_env, &repo_path, "right", "");
+    check_resolve_produces_input_file(&mut test_env, &repo_path, "file", "base", "base\n");
+    check_resolve_produces_input_file(&mut test_env, &repo_path, "file", "left", "a\n");
+    check_resolve_produces_input_file(&mut test_env, &repo_path, "file", "right", "");
 }
 
 #[test]
diff --git a/cli/tests/test_revset_output.rs b/cli/tests/test_revset_output.rs
index 85556ec61d..df723efbb2 100644
--- a/cli/tests/test_revset_output.rs
+++ b/cli/tests/test_revset_output.rs
@@ -372,14 +372,14 @@ fn test_alias() {
 
     let stderr = test_env.jj_cmd_failure(&repo_path, &["log", "-r", "my_author(none())"]);
     insta::assert_snapshot!(stderr, @r###"
-    Error: Failed to parse revset: Alias "my_author()" cannot be expanded
+    Error: Failed to parse revset: Alias "my_author(x)" cannot be expanded
     Caused by:
     1:  --> 1:1
       |
     1 | my_author(none())
       | ^---------------^
       |
-      = Alias "my_author()" cannot be expanded
+      = Alias "my_author(x)" cannot be expanded
     2:  --> 1:8
       |
     1 | author(x)
diff --git a/cli/tests/test_sparse_command.rs b/cli/tests/test_sparse_command.rs
index 0ad3f0dcdb..b01e791342 100644
--- a/cli/tests/test_sparse_command.rs
+++ b/cli/tests/test_sparse_command.rs
@@ -49,7 +49,7 @@ fn test_sparse_manage_patterns() {
     assert!(!repo_path.join("file2").exists());
     assert!(!repo_path.join("file3").exists());
     // But they're still in the commit
-    let stdout = test_env.jj_cmd_success(&repo_path, &["files"]);
+    let stdout = test_env.jj_cmd_success(&repo_path, &["file", "list"]);
     insta::assert_snapshot!(stdout, @r###"
     file1
     file2
diff --git a/cli/tests/test_split_command.rs b/cli/tests/test_split_command.rs
index 36768099b6..2b3666b1da 100644
--- a/cli/tests/test_split_command.rs
+++ b/cli/tests/test_split_command.rs
@@ -343,7 +343,7 @@ fn test_split_siblings_no_descendants() {
         ["dump editor1", "next invocation\n", "dump editor2"].join("\0"),
     )
     .unwrap();
-    let (stdout, stderr) = test_env.jj_cmd_ok(&workspace_path, &["split", "--siblings", "file1"]);
+    let (stdout, stderr) = test_env.jj_cmd_ok(&workspace_path, &["split", "--parallel", "file1"]);
     insta::assert_snapshot!(stdout, @"");
     insta::assert_snapshot!(stderr, @r###"
     First part: qpvuntsm 8d2b7558 TESTED=TODO
@@ -421,7 +421,7 @@ fn test_split_siblings_with_descendants() {
         .join("\0"),
     )
     .unwrap();
-    let (stdout, stderr) = test_env.jj_cmd_ok(&workspace_path, &["split", "--siblings", "file1"]);
+    let (stdout, stderr) = test_env.jj_cmd_ok(&workspace_path, &["split", "--parallel", "file1"]);
     insta::assert_snapshot!(stdout, @"");
     insta::assert_snapshot!(stderr, @r###"
     Rebased 2 descendant commits
@@ -500,7 +500,7 @@ fn test_split_siblings_with_merge_child() {
     .unwrap();
     let (stdout, stderr) = test_env.jj_cmd_ok(
         &workspace_path,
-        &["split", "-r", "description(a)", "--siblings", "file1"],
+        &["split", "-r", "description(a)", "--parallel", "file1"],
     );
     insta::assert_snapshot!(stdout, @"");
     insta::assert_snapshot!(stderr, @r###"
diff --git a/cli/tests/test_squash_command.rs b/cli/tests/test_squash_command.rs
index da672d923a..25117bfe06 100644
--- a/cli/tests/test_squash_command.rs
+++ b/cli/tests/test_squash_command.rs
@@ -51,7 +51,7 @@ fn test_squash() {
     ◉  90aeefd03044 a
     ◉  000000000000
     "###);
-    let stdout = test_env.jj_cmd_success(&repo_path, &["print", "file1"]);
+    let stdout = test_env.jj_cmd_success(&repo_path, &["file", "show", "file1"]);
     insta::assert_snapshot!(stdout, @r###"
     c
     "###);
@@ -70,11 +70,11 @@ fn test_squash() {
     ◉  893c93ae2a87 a b
     ◉  000000000000
     "###);
-    let stdout = test_env.jj_cmd_success(&repo_path, &["print", "file1", "-r", "b"]);
+    let stdout = test_env.jj_cmd_success(&repo_path, &["file", "show", "file1", "-r", "b"]);
     insta::assert_snapshot!(stdout, @r###"
     b
     "###);
-    let stdout = test_env.jj_cmd_success(&repo_path, &["print", "file1"]);
+    let stdout = test_env.jj_cmd_success(&repo_path, &["file", "show", "file1"]);
     insta::assert_snapshot!(stdout, @r###"
     c
     "###);
@@ -123,7 +123,7 @@ fn test_squash() {
     ◉  90aeefd03044 a
     ◉  000000000000
     "###);
-    let stdout = test_env.jj_cmd_success(&repo_path, &["print", "file1", "-r", "e"]);
+    let stdout = test_env.jj_cmd_success(&repo_path, &["file", "show", "file1", "-r", "e"]);
     insta::assert_snapshot!(stdout, @r###"
     e
     "###);
@@ -169,7 +169,7 @@ fn test_squash_partial() {
     ◉  c9f931cd78af a b
     ◉  000000000000
     "###);
-    let stdout = test_env.jj_cmd_success(&repo_path, &["print", "file1", "-r", "a"]);
+    let stdout = test_env.jj_cmd_success(&repo_path, &["file", "show", "file1", "-r", "a"]);
     insta::assert_snapshot!(stdout, @r###"
     b
     "###);
@@ -190,19 +190,19 @@ fn test_squash_partial() {
     ◉  0c5ddc685260 a
     ◉  000000000000
     "###);
-    let stdout = test_env.jj_cmd_success(&repo_path, &["print", "file1", "-r", "a"]);
+    let stdout = test_env.jj_cmd_success(&repo_path, &["file", "show", "file1", "-r", "a"]);
     insta::assert_snapshot!(stdout, @r###"
     a
     "###);
-    let stdout = test_env.jj_cmd_success(&repo_path, &["print", "file2", "-r", "a"]);
+    let stdout = test_env.jj_cmd_success(&repo_path, &["file", "show", "file2", "-r", "a"]);
     insta::assert_snapshot!(stdout, @r###"
     b
     "###);
-    let stdout = test_env.jj_cmd_success(&repo_path, &["print", "file1", "-r", "b"]);
+    let stdout = test_env.jj_cmd_success(&repo_path, &["file", "show", "file1", "-r", "b"]);
     insta::assert_snapshot!(stdout, @r###"
     b
     "###);
-    let stdout = test_env.jj_cmd_success(&repo_path, &["print", "file2", "-r", "b"]);
+    let stdout = test_env.jj_cmd_success(&repo_path, &["file", "show", "file2", "-r", "b"]);
     insta::assert_snapshot!(stdout, @r###"
     b
     "###);
@@ -224,19 +224,19 @@ fn test_squash_partial() {
     ◉  70621f4c7a42 a
     ◉  000000000000
     "###);
-    let stdout = test_env.jj_cmd_success(&repo_path, &["print", "file1", "-r", "a"]);
+    let stdout = test_env.jj_cmd_success(&repo_path, &["file", "show", "file1", "-r", "a"]);
     insta::assert_snapshot!(stdout, @r###"
     a
     "###);
-    let stdout = test_env.jj_cmd_success(&repo_path, &["print", "file2", "-r", "a"]);
+    let stdout = test_env.jj_cmd_success(&repo_path, &["file", "show", "file2", "-r", "a"]);
     insta::assert_snapshot!(stdout, @r###"
     b
     "###);
-    let stdout = test_env.jj_cmd_success(&repo_path, &["print", "file1", "-r", "b"]);
+    let stdout = test_env.jj_cmd_success(&repo_path, &["file", "show", "file1", "-r", "b"]);
     insta::assert_snapshot!(stdout, @r###"
     b
     "###);
-    let stdout = test_env.jj_cmd_success(&repo_path, &["print", "file2", "-r", "b"]);
+    let stdout = test_env.jj_cmd_success(&repo_path, &["file", "show", "file2", "-r", "b"]);
     insta::assert_snapshot!(stdout, @r###"
     b
     "###);
@@ -332,12 +332,12 @@ fn test_squash_from_to() {
     ◉  000000000000
     "###);
     // The change from the source has been applied
-    let stdout = test_env.jj_cmd_success(&repo_path, &["print", "file1"]);
+    let stdout = test_env.jj_cmd_success(&repo_path, &["file", "show", "file1"]);
     insta::assert_snapshot!(stdout, @r###"
     c
     "###);
     // File `file2`, which was not changed in source, is unchanged
-    let stdout = test_env.jj_cmd_success(&repo_path, &["print", "file2"]);
+    let stdout = test_env.jj_cmd_success(&repo_path, &["file", "show", "file2"]);
     insta::assert_snapshot!(stdout, @r###"
     f
     "###);
@@ -363,7 +363,7 @@ fn test_squash_from_to() {
     "###);
     // The change from the source has been applied (the file contents were already
     // "f", as is typically the case when moving changes from an ancestor)
-    let stdout = test_env.jj_cmd_success(&repo_path, &["print", "file2"]);
+    let stdout = test_env.jj_cmd_success(&repo_path, &["file", "show", "file2"]);
     insta::assert_snapshot!(stdout, @r###"
     f
     "###);
@@ -390,7 +390,7 @@ fn test_squash_from_to() {
     ◉  000000000000
     "###);
     // The change from the source has been applied
-    let stdout = test_env.jj_cmd_success(&repo_path, &["print", "file2", "-r", "d"]);
+    let stdout = test_env.jj_cmd_success(&repo_path, &["file", "show", "file2", "-r", "d"]);
     insta::assert_snapshot!(stdout, @r###"
     e
     "###);
@@ -451,16 +451,16 @@ fn test_squash_from_to_partial() {
     ◉  000000000000
     "###);
     // The changes from the source has been applied
-    let stdout = test_env.jj_cmd_success(&repo_path, &["print", "file1"]);
+    let stdout = test_env.jj_cmd_success(&repo_path, &["file", "show", "file1"]);
     insta::assert_snapshot!(stdout, @r###"
     c
     "###);
-    let stdout = test_env.jj_cmd_success(&repo_path, &["print", "file2"]);
+    let stdout = test_env.jj_cmd_success(&repo_path, &["file", "show", "file2"]);
     insta::assert_snapshot!(stdout, @r###"
     c
     "###);
     // File `file3`, which was not changed in source, is unchanged
-    let stdout = test_env.jj_cmd_success(&repo_path, &["print", "file3"]);
+    let stdout = test_env.jj_cmd_success(&repo_path, &["file", "show", "file3"]);
     insta::assert_snapshot!(stdout, @r###"
     d
     "###);
@@ -484,17 +484,17 @@ fn test_squash_from_to_partial() {
     ◉  000000000000
     "###);
     // The selected change from the source has been applied
-    let stdout = test_env.jj_cmd_success(&repo_path, &["print", "file1"]);
+    let stdout = test_env.jj_cmd_success(&repo_path, &["file", "show", "file1"]);
     insta::assert_snapshot!(stdout, @r###"
     c
     "###);
     // The unselected change from the source has not been applied
-    let stdout = test_env.jj_cmd_success(&repo_path, &["print", "file2"]);
+    let stdout = test_env.jj_cmd_success(&repo_path, &["file", "show", "file2"]);
     insta::assert_snapshot!(stdout, @r###"
     a
     "###);
     // File `file3`, which was changed in source's parent, is unchanged
-    let stdout = test_env.jj_cmd_success(&repo_path, &["print", "file3"]);
+    let stdout = test_env.jj_cmd_success(&repo_path, &["file", "show", "file3"]);
     insta::assert_snapshot!(stdout, @r###"
     d
     "###);
@@ -519,17 +519,17 @@ fn test_squash_from_to_partial() {
     ◉  000000000000
     "###);
     // The selected change from the source has been applied
-    let stdout = test_env.jj_cmd_success(&repo_path, &["print", "file1"]);
+    let stdout = test_env.jj_cmd_success(&repo_path, &["file", "show", "file1"]);
     insta::assert_snapshot!(stdout, @r###"
     c
     "###);
     // The unselected change from the source has not been applied
-    let stdout = test_env.jj_cmd_success(&repo_path, &["print", "file2"]);
+    let stdout = test_env.jj_cmd_success(&repo_path, &["file", "show", "file2"]);
     insta::assert_snapshot!(stdout, @r###"
     a
     "###);
     // File `file3`, which was changed in source's parent, is unchanged
-    let stdout = test_env.jj_cmd_success(&repo_path, &["print", "file3"]);
+    let stdout = test_env.jj_cmd_success(&repo_path, &["file", "show", "file3"]);
     insta::assert_snapshot!(stdout, @r###"
     d
     "###);
@@ -555,12 +555,12 @@ fn test_squash_from_to_partial() {
     ◉  000000000000
     "###);
     // The selected change from the source has been applied
-    let stdout = test_env.jj_cmd_success(&repo_path, &["print", "file1", "-r", "b"]);
+    let stdout = test_env.jj_cmd_success(&repo_path, &["file", "show", "file1", "-r", "b"]);
     insta::assert_snapshot!(stdout, @r###"
     c
     "###);
     // The unselected change from the source has not been applied
-    let stdout = test_env.jj_cmd_success(&repo_path, &["print", "file2", "-r", "b"]);
+    let stdout = test_env.jj_cmd_success(&repo_path, &["file", "show", "file2", "-r", "b"]);
     insta::assert_snapshot!(stdout, @r###"
     a
     "###);
@@ -647,7 +647,7 @@ fn test_squash_from_multiple() {
     ◉  000000000000
     "###);
     // The changes from the sources have been applied
-    let stdout = test_env.jj_cmd_success(&repo_path, &["print", "-r=d", "file"]);
+    let stdout = test_env.jj_cmd_success(&repo_path, &["file", "show", "-r=d", "file"]);
     insta::assert_snapshot!(stdout, @r###"
     <<<<<<< Conflict 1 of 1
     %%%%%%% Changes from base #1 to side #1
@@ -680,7 +680,7 @@ fn test_squash_from_multiple() {
     ◉  000000000000
     "###);
     // The changes from the sources have been applied to the destination
-    let stdout = test_env.jj_cmd_success(&repo_path, &["print", "-r=e", "file"]);
+    let stdout = test_env.jj_cmd_success(&repo_path, &["file", "show", "-r=e", "file"]);
     insta::assert_snapshot!(stdout, @r###"
     f
     "###);
@@ -775,16 +775,16 @@ fn test_squash_from_multiple_partial() {
     ◉  000000000000
     "###);
     // The selected changes have been removed from the sources
-    let stdout = test_env.jj_cmd_success(&repo_path, &["print", "-r=b", "file1"]);
+    let stdout = test_env.jj_cmd_success(&repo_path, &["file", "show", "-r=b", "file1"]);
     insta::assert_snapshot!(stdout, @r###"
     a
     "###);
-    let stdout = test_env.jj_cmd_success(&repo_path, &["print", "-r=c", "file1"]);
+    let stdout = test_env.jj_cmd_success(&repo_path, &["file", "show", "-r=c", "file1"]);
     insta::assert_snapshot!(stdout, @r###"
     a
     "###);
     // The selected changes from the sources have been applied
-    let stdout = test_env.jj_cmd_success(&repo_path, &["print", "-r=d", "file1"]);
+    let stdout = test_env.jj_cmd_success(&repo_path, &["file", "show", "-r=d", "file1"]);
     insta::assert_snapshot!(stdout, @r###"
     <<<<<<< Conflict 1 of 1
     %%%%%%% Changes from base #1 to side #1
@@ -799,7 +799,7 @@ fn test_squash_from_multiple_partial() {
     "###);
     // The unselected change from the sources have not been applied to the
     // destination
-    let stdout = test_env.jj_cmd_success(&repo_path, &["print", "-r=d", "file2"]);
+    let stdout = test_env.jj_cmd_success(&repo_path, &["file", "show", "-r=d", "file2"]);
     insta::assert_snapshot!(stdout, @r###"
     d
     "###);
@@ -827,25 +827,25 @@ fn test_squash_from_multiple_partial() {
     ◉  000000000000
     "###);
     // The selected changes have been removed from the sources
-    let stdout = test_env.jj_cmd_success(&repo_path, &["print", "-r=b", "file1"]);
+    let stdout = test_env.jj_cmd_success(&repo_path, &["file", "show", "-r=b", "file1"]);
     insta::assert_snapshot!(stdout, @r###"
     a
     "###);
-    let stdout = test_env.jj_cmd_success(&repo_path, &["print", "-r=c", "file1"]);
+    let stdout = test_env.jj_cmd_success(&repo_path, &["file", "show", "-r=c", "file1"]);
     insta::assert_snapshot!(stdout, @r###"
     a
     "###);
-    let stdout = test_env.jj_cmd_success(&repo_path, &["print", "-r=f", "file1"]);
+    let stdout = test_env.jj_cmd_success(&repo_path, &["file", "show", "-r=f", "file1"]);
     insta::assert_snapshot!(stdout, @r###"
     f
     "###);
     // The selected changes from the sources have been applied to the destination
-    let stdout = test_env.jj_cmd_success(&repo_path, &["print", "-r=e", "file1"]);
+    let stdout = test_env.jj_cmd_success(&repo_path, &["file", "show", "-r=e", "file1"]);
     insta::assert_snapshot!(stdout, @r###"
     f
     "###);
     // The unselected changes from the sources have not been applied
-    let stdout = test_env.jj_cmd_success(&repo_path, &["print", "-r=d", "file2"]);
+    let stdout = test_env.jj_cmd_success(&repo_path, &["file", "show", "-r=d", "file2"]);
     insta::assert_snapshot!(stdout, @r###"
     d
     "###);
diff --git a/cli/tests/test_status_command.rs b/cli/tests/test_status_command.rs
index 099a60c034..b8925e242e 100644
--- a/cli/tests/test_status_command.rs
+++ b/cli/tests/test_status_command.rs
@@ -12,8 +12,30 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+use std::path::Path;
+
 use crate::common::TestEnvironment;
 
+fn create_commit(
+    test_env: &TestEnvironment,
+    repo_path: &Path,
+    name: &str,
+    parents: &[&str],
+    files: &[(&str, &str)],
+) {
+    if parents.is_empty() {
+        test_env.jj_cmd_ok(repo_path, &["new", "root()", "-m", name]);
+    } else {
+        let mut args = vec!["new", "-m", name];
+        args.extend(parents);
+        test_env.jj_cmd_ok(repo_path, &args);
+    }
+    for (name, content) in files {
+        std::fs::write(repo_path.join(name), content).unwrap();
+    }
+    test_env.jj_cmd_ok(repo_path, &["branch", "create", name]);
+}
+
 #[test]
 fn test_status_merge() {
     let test_env = TestEnvironment::default();
@@ -154,3 +176,51 @@ fn test_status_display_rebase_instructions() {
     Then run `jj squash` to move the resolution into the conflicted commit.
     "###);
 }
+
+#[test]
+fn test_status_simplify_conflict_sides() {
+    let test_env = TestEnvironment::default();
+    test_env.jj_cmd_ok(test_env.env_root(), &["git", "init", "repo"]);
+    let repo_path = test_env.env_root().join("repo");
+
+    // Creates a 4-sided conflict, with fileA and fileB having different conflicts:
+    // fileA: A - B + C - B + B - B + B
+    // fileB: A - A + A - A + B - C + D
+    create_commit(
+        &test_env,
+        &repo_path,
+        "base",
+        &[],
+        &[("fileA", "base\n"), ("fileB", "base\n")],
+    );
+    create_commit(&test_env, &repo_path, "a1", &["base"], &[("fileA", "1\n")]);
+    create_commit(&test_env, &repo_path, "a2", &["base"], &[("fileA", "2\n")]);
+    create_commit(&test_env, &repo_path, "b1", &["base"], &[("fileB", "1\n")]);
+    create_commit(&test_env, &repo_path, "b2", &["base"], &[("fileB", "2\n")]);
+    create_commit(&test_env, &repo_path, "conflictA", &["a1", "a2"], &[]);
+    create_commit(&test_env, &repo_path, "conflictB", &["b1", "b2"], &[]);
+    create_commit(
+        &test_env,
+        &repo_path,
+        "conflict",
+        &["conflictA", "conflictB"],
+        &[],
+    );
+
+    insta::assert_snapshot!(test_env.jj_cmd_success(&repo_path, &["status"]),
+    @r###"
+    The working copy is clean
+    There are unresolved conflicts at these paths:
+    fileA    2-sided conflict
+    fileB    2-sided conflict
+    Working copy : nkmrtpmo 7b1cdcaa conflict | (conflict) (empty) conflict
+    Parent commit: kmkuslsw 18c1fb00 conflictA | (conflict) (empty) conflictA
+    Parent commit: lylxulpl d11c92eb conflictB | (conflict) (empty) conflictB
+    To resolve the conflicts, start by updating to one of the first ones:
+      jj new lylxulplsnyw
+      jj new kmkuslswpqwq
+    Then use `jj resolve`, or edit the conflict markers in the file directly.
+    Once the conflicts are resolved, you may want inspect the result with `jj diff`.
+    Then run `jj squash` to move the resolution into the conflicted commit.
+    "###);
+}
diff --git a/cli/tests/test_templater.rs b/cli/tests/test_templater.rs
index 5f086f22a7..29255c750e 100644
--- a/cli/tests/test_templater.rs
+++ b/cli/tests/test_templater.rs
@@ -84,14 +84,14 @@ fn test_templater_parse_error() {
     Hint: Did you mean "s", "self"?
     "###);
     insta::assert_snapshot!(render_err(r#"format_id(commit_id)"#), @r###"
-    Error: Failed to parse template: Alias "format_id()" cannot be expanded
+    Error: Failed to parse template: Alias "format_id(id)" cannot be expanded
     Caused by:
     1:  --> 1:1
       |
     1 | format_id(commit_id)
       | ^------------------^
       |
-      = Alias "format_id()" cannot be expanded
+      = Alias "format_id(id)" cannot be expanded
     2:  --> 1:4
       |
     1 | id.sort()
@@ -189,14 +189,14 @@ fn test_templater_alias() {
     "###);
 
     insta::assert_snapshot!(render_err(r#"identity(identity(commit_id.short("")))"#), @r###"
-    Error: Failed to parse template: Alias "identity()" cannot be expanded
+    Error: Failed to parse template: Alias "identity(x)" cannot be expanded
     Caused by:
     1:  --> 1:1
       |
     1 | identity(identity(commit_id.short("")))
       | ^-------------------------------------^
       |
-      = Alias "identity()" cannot be expanded
+      = Alias "identity(x)" cannot be expanded
     2:  --> 1:1
       |
     1 | x
@@ -208,7 +208,7 @@ fn test_templater_alias() {
     1 | identity(identity(commit_id.short("")))
       |          ^---------------------------^
       |
-      = Alias "identity()" cannot be expanded
+      = Alias "identity(x)" cannot be expanded
     4:  --> 1:1
       |
     1 | x
@@ -272,14 +272,14 @@ fn test_templater_alias() {
     "###);
 
     insta::assert_snapshot!(render_err(r#"coalesce(label("x", "not boolean"), "")"#), @r###"
-    Error: Failed to parse template: Alias "coalesce()" cannot be expanded
+    Error: Failed to parse template: Alias "coalesce(x, y)" cannot be expanded
     Caused by:
     1:  --> 1:1
       |
     1 | coalesce(label("x", "not boolean"), "")
       | ^-------------------------------------^
       |
-      = Alias "coalesce()" cannot be expanded
+      = Alias "coalesce(x, y)" cannot be expanded
     2:  --> 1:4
       |
     1 | if(x, x, y)
diff --git a/cli/tests/test_unsquash_command.rs b/cli/tests/test_unsquash_command.rs
index f2e3b6ddd8..c7e3ad0218 100644
--- a/cli/tests/test_unsquash_command.rs
+++ b/cli/tests/test_unsquash_command.rs
@@ -50,7 +50,7 @@ fn test_unsquash() {
     ◉  90aeefd03044 a b
     ◉  000000000000
     "###);
-    let stdout = test_env.jj_cmd_success(&repo_path, &["print", "file1"]);
+    let stdout = test_env.jj_cmd_success(&repo_path, &["file", "show", "file1"]);
     insta::assert_snapshot!(stdout, @r###"
     c
     "###);
@@ -69,11 +69,11 @@ fn test_unsquash() {
     ◉  9146bcc8d996 b
     ◉  000000000000 a
     "###);
-    let stdout = test_env.jj_cmd_success(&repo_path, &["print", "file1", "-r", "b"]);
+    let stdout = test_env.jj_cmd_success(&repo_path, &["file", "show", "file1", "-r", "b"]);
     insta::assert_snapshot!(stdout, @r###"
     b
     "###);
-    let stdout = test_env.jj_cmd_success(&repo_path, &["print", "file1"]);
+    let stdout = test_env.jj_cmd_success(&repo_path, &["file", "show", "file1"]);
     insta::assert_snapshot!(stdout, @r###"
     c
     "###);
@@ -122,7 +122,7 @@ fn test_unsquash() {
     ◉  90aeefd03044 a
     ◉  000000000000
     "###);
-    let stdout = test_env.jj_cmd_success(&repo_path, &["print", "file1"]);
+    let stdout = test_env.jj_cmd_success(&repo_path, &["file", "show", "file1"]);
     insta::assert_snapshot!(stdout, @r###"
     e
     "###);
@@ -169,7 +169,7 @@ fn test_unsquash_partial() {
     ◉  ee67504598b6 a
     ◉  000000000000
     "###);
-    let stdout = test_env.jj_cmd_success(&repo_path, &["print", "file1", "-r", "a"]);
+    let stdout = test_env.jj_cmd_success(&repo_path, &["file", "show", "file1", "-r", "a"]);
     insta::assert_snapshot!(stdout, @r###"
     a
     "###);
@@ -189,19 +189,19 @@ fn test_unsquash_partial() {
     ◉  47a1e795d146 a
     ◉  000000000000
     "###);
-    let stdout = test_env.jj_cmd_success(&repo_path, &["print", "file1", "-r", "b"]);
+    let stdout = test_env.jj_cmd_success(&repo_path, &["file", "show", "file1", "-r", "b"]);
     insta::assert_snapshot!(stdout, @r###"
     a
     "###);
-    let stdout = test_env.jj_cmd_success(&repo_path, &["print", "file2", "-r", "b"]);
+    let stdout = test_env.jj_cmd_success(&repo_path, &["file", "show", "file2", "-r", "b"]);
     insta::assert_snapshot!(stdout, @r###"
     b
     "###);
-    let stdout = test_env.jj_cmd_success(&repo_path, &["print", "file1", "-r", "c"]);
+    let stdout = test_env.jj_cmd_success(&repo_path, &["file", "show", "file1", "-r", "c"]);
     insta::assert_snapshot!(stdout, @r###"
     c
     "###);
-    let stdout = test_env.jj_cmd_success(&repo_path, &["print", "file2", "-r", "c"]);
+    let stdout = test_env.jj_cmd_success(&repo_path, &["file", "show", "file2", "-r", "c"]);
     insta::assert_snapshot!(stdout, @r###"
     c
     "###);
@@ -221,19 +221,19 @@ fn test_unsquash_partial() {
     Working copy now at: mzvwutvl 1c82d27c c | (no description set)
     Parent commit      : kkmpptxz b9d23fd8 b | (no description set)
     "###);
-    let stdout = test_env.jj_cmd_success(&repo_path, &["print", "file1", "-r", "b"]);
+    let stdout = test_env.jj_cmd_success(&repo_path, &["file", "show", "file1", "-r", "b"]);
     insta::assert_snapshot!(stdout, @r###"
     a
     "###);
-    let stdout = test_env.jj_cmd_success(&repo_path, &["print", "file2", "-r", "b"]);
+    let stdout = test_env.jj_cmd_success(&repo_path, &["file", "show", "file2", "-r", "b"]);
     insta::assert_snapshot!(stdout, @r###"
     b
     "###);
-    let stdout = test_env.jj_cmd_success(&repo_path, &["print", "file1", "-r", "c"]);
+    let stdout = test_env.jj_cmd_success(&repo_path, &["file", "show", "file1", "-r", "c"]);
     insta::assert_snapshot!(stdout, @r###"
     c
     "###);
-    let stdout = test_env.jj_cmd_success(&repo_path, &["print", "file2", "-r", "c"]);
+    let stdout = test_env.jj_cmd_success(&repo_path, &["file", "show", "file2", "-r", "c"]);
     insta::assert_snapshot!(stdout, @r###"
     c
     "###);
diff --git a/cli/tests/test_untrack_command.rs b/cli/tests/test_untrack_command.rs
index 78804b59cc..53f08edc23 100644
--- a/cli/tests/test_untrack_command.rs
+++ b/cli/tests/test_untrack_command.rs
@@ -35,7 +35,7 @@ fn test_untrack() {
     // patterns
     test_env.jj_cmd_ok(&repo_path, &["st"]);
     std::fs::write(repo_path.join(".gitignore"), "*.bak\n").unwrap();
-    let files_before = test_env.jj_cmd_success(&repo_path, &["files"]);
+    let files_before = test_env.jj_cmd_success(&repo_path, &["file", "list"]);
 
     // Errors out when not run at the head operation
     let stderr = test_env.jj_cmd_failure(&repo_path, &["untrack", "file1", "--at-op", "@-"]);
@@ -60,7 +60,7 @@ fn test_untrack() {
     Hint: Files that are not ignored will be added back by the next command.
     Make sure they're ignored, then try again.
     "###);
-    let files_after = test_env.jj_cmd_success(&repo_path, &["files"]);
+    let files_after = test_env.jj_cmd_success(&repo_path, &["file", "list"]);
     // There should be no changes to the state when there was an error
     assert_eq!(files_after, files_before);
 
@@ -69,7 +69,7 @@ fn test_untrack() {
     let (stdout, stderr) = test_env.jj_cmd_ok(&repo_path, &["untrack", "file1.bak"]);
     insta::assert_snapshot!(stdout, @"");
     insta::assert_snapshot!(stderr, @"");
-    let files_after = test_env.jj_cmd_success(&repo_path, &["files"]);
+    let files_after = test_env.jj_cmd_success(&repo_path, &["file", "list"]);
     // The file is no longer tracked
     assert!(!files_after.contains("file1.bak"));
     // Other files that match the ignore pattern are not untracked
@@ -94,7 +94,7 @@ fn test_untrack() {
     let (stdout, stderr) = test_env.jj_cmd_ok(&repo_path, &["untrack", "target"]);
     insta::assert_snapshot!(stdout, @"");
     insta::assert_snapshot!(stderr, @"");
-    let files_after = test_env.jj_cmd_success(&repo_path, &["files"]);
+    let files_after = test_env.jj_cmd_success(&repo_path, &["file", "list"]);
     assert!(!files_after.contains("target"));
 }
 
@@ -111,7 +111,7 @@ fn test_untrack_sparse() {
     // When untracking a file that's not included in the sparse working copy, it
     // doesn't need to be ignored (because it won't be automatically added
     // back).
-    let stdout = test_env.jj_cmd_success(&repo_path, &["files"]);
+    let stdout = test_env.jj_cmd_success(&repo_path, &["file", "list"]);
     insta::assert_snapshot!(stdout, @r###"
     file1
     file2
@@ -120,7 +120,7 @@ fn test_untrack_sparse() {
     let (stdout, stderr) = test_env.jj_cmd_ok(&repo_path, &["untrack", "file2"]);
     insta::assert_snapshot!(stdout, @"");
     insta::assert_snapshot!(stderr, @"");
-    let stdout = test_env.jj_cmd_success(&repo_path, &["files"]);
+    let stdout = test_env.jj_cmd_success(&repo_path, &["file", "list"]);
     insta::assert_snapshot!(stdout, @r###"
     file1
     "###);
diff --git a/cli/tests/test_working_copy.rs b/cli/tests/test_working_copy.rs
index 172d944bc9..55a859ca99 100644
--- a/cli/tests/test_working_copy.rs
+++ b/cli/tests/test_working_copy.rs
@@ -24,7 +24,7 @@ fn test_snapshot_large_file() {
     // in bytes
     test_env.add_config(r#"snapshot.max-new-file-size = 10"#);
     std::fs::write(repo_path.join("large"), "a lot of text").unwrap();
-    let stderr = test_env.jj_cmd_failure(&repo_path, &["files"]);
+    let stderr = test_env.jj_cmd_failure(&repo_path, &["file", "list"]);
     insta::assert_snapshot!(stderr, @r###"
     Error: Failed to snapshot the working copy
     The file '$TEST_ENV/repo/large' is too large to be snapshotted: it is 3 bytes too large; the maximum size allowed is 10 bytes (10.0B).
@@ -40,7 +40,7 @@ fn test_snapshot_large_file() {
     test_env.add_config(r#"snapshot.max-new-file-size = "10KB""#);
     let big_string = vec![0; 1024 * 11];
     std::fs::write(repo_path.join("large"), big_string).unwrap();
-    let stderr = test_env.jj_cmd_failure(&repo_path, &["files"]);
+    let stderr = test_env.jj_cmd_failure(&repo_path, &["file", "list"]);
     insta::assert_snapshot!(stderr, @r###"
     Error: Failed to snapshot the working copy
     The file '$TEST_ENV/repo/large' is too large to be snapshotted: it is 1024 bytes too large; the maximum size allowed is 10240 bytes (10.0KiB).
diff --git a/cli/tests/test_workspaces.rs b/cli/tests/test_workspaces.rs
index e84983de53..97bd597e4a 100644
--- a/cli/tests/test_workspaces.rs
+++ b/cli/tests/test_workspaces.rs
@@ -643,7 +643,7 @@ fn test_workspaces_forget() {
     // Revision "@" cannot be used
     let stderr = test_env.jj_cmd_failure(&main_path, &["log", "-r", "@"]);
     insta::assert_snapshot!(stderr, @r###"
-    Error: Workspace "default" doesn't have a working copy
+    Error: Workspace "default" doesn't have a working-copy commit
     "###);
 
     // Try to add back the workspace
@@ -782,6 +782,42 @@ fn test_workspaces_root() {
     "###);
 }
 
+#[test]
+fn test_debug_snapshot() {
+    let test_env = TestEnvironment::default();
+    test_env.jj_cmd_ok(test_env.env_root(), &["git", "init", "repo"]);
+    let repo_path = test_env.env_root().join("repo");
+
+    std::fs::write(repo_path.join("file"), "contents").unwrap();
+    test_env.jj_cmd_ok(&repo_path, &["debug", "snapshot"]);
+    let stdout = test_env.jj_cmd_success(&repo_path, &["op", "log"]);
+    insta::assert_snapshot!(stdout, @r###"
+    @  2d01fc903f0f test-username@host.example.com 2001-02-03 04:05:08.000 +07:00 - 2001-02-03 04:05:08.000 +07:00
+    │  snapshot working copy
+    │  args: jj debug snapshot
+    ◉  b51416386f26 test-username@host.example.com 2001-02-03 04:05:07.000 +07:00 - 2001-02-03 04:05:07.000 +07:00
+    │  add workspace 'default'
+    ◉  9a7d829846af test-username@host.example.com 2001-02-03 04:05:07.000 +07:00 - 2001-02-03 04:05:07.000 +07:00
+    │  initialize repo
+    ◉  000000000000 root()
+    "###);
+    test_env.jj_cmd_ok(&repo_path, &["describe", "-m", "initial"]);
+    let stdout = test_env.jj_cmd_success(&repo_path, &["op", "log"]);
+    insta::assert_snapshot!(stdout, @r###"
+    @  53a64275e379 test-username@host.example.com 2001-02-03 04:05:10.000 +07:00 - 2001-02-03 04:05:10.000 +07:00
+    │  describe commit 123ed18e4c4c0d77428df41112bc02ffc83fb935
+    │  args: jj describe -m initial
+    ◉  2d01fc903f0f test-username@host.example.com 2001-02-03 04:05:08.000 +07:00 - 2001-02-03 04:05:08.000 +07:00
+    │  snapshot working copy
+    │  args: jj debug snapshot
+    ◉  b51416386f26 test-username@host.example.com 2001-02-03 04:05:07.000 +07:00 - 2001-02-03 04:05:07.000 +07:00
+    │  add workspace 'default'
+    ◉  9a7d829846af test-username@host.example.com 2001-02-03 04:05:07.000 +07:00 - 2001-02-03 04:05:07.000 +07:00
+    │  initialize repo
+    ◉  000000000000 root()
+    "###);
+}
+
 fn get_log_output(test_env: &TestEnvironment, cwd: &Path) -> String {
     let template = r#"
     separate(" ",
diff --git a/deny.toml b/deny.toml
index 51591c3b8e..fb85836a47 100644
--- a/deny.toml
+++ b/deny.toml
@@ -85,6 +85,7 @@ allow = [
     "BSD-3-Clause",
     "ISC",
     "MIT",
+    "Unicode-3.0",
     "Unicode-DFS-2016",
 ]
 # List of explicitly disallowed licenses
diff --git a/docs/cli-reference.md b/docs/cli-reference.md
index 5314592b52..2db6105323 100644
--- a/docs/cli-reference.md
+++ b/docs/cli-reference.md
@@ -10,11 +10,7 @@
 
     Run `jj help <COMMAND>` for more authoritative documentation.
 
-    For example, each argument for each command will show only one
-    paragraph of documentation on this page, even if `jj help` would
-    show multiple paragraphs with additional details.
-
-    <!-- https://github.com/ConnorGray/clap-markdown/issues/20 -->
+    If you see a significant difference, feel free to file a bug, or a PR to note the difference here.
 
 
 {%
diff --git a/docs/community_tools.md b/docs/community_tools.md
new file mode 100644
index 0000000000..7b9d880035
--- /dev/null
+++ b/docs/community_tools.md
@@ -0,0 +1,55 @@
+# Community-built tools around Jujutsu
+
+**Important:** Many of these are not complete yet, just like Jujutsu itself.
+But they already simplify many workflows and can improve your experience.
+
+
+## Diffedit3 
+
+Diffedit3 is a web-based alternate to Meld, as it no longer is packaged and 
+available for all Distros. Its creator is also a frequent contributor.
+
+Find it [here][diffedit3]
+
+## GG - GUI for JJ
+
+GG is a cross platform GUI for Jujutsu which makes all graph manipulating 
+workflows quite easy. Take a look at its README.md as it quite descriptive.
+
+Find it [here][gg].
+
+
+## LazyJJ
+
+lazyjj is a lazygit inspired TUI for Jujutsu.
+
+Find it [here][lazyjj].
+
+## JJ TUI
+
+This is TUI for Jujutsu built in Ocaml, it is unopiniated and its creator is 
+open to feedback.
+
+Find it [here][jj_tui].
+
+
+## Visual Jujutsu
+
+VJJ is a fzf (fuzzy finder) wrapper for Jujutsu, which is meant to be used 
+interactively in the terminal. 
+
+Find it [here][vjj].
+
+<!-- TODO: Add benbrittains/cultivate when its ready -->
+## Finding other integrations 
+
+You can find other community contributed tools and integrations in our 
+[Wiki].
+
+[cultivate]: https://github.com/benbrittain/cultivate
+[diffedit3]: https://github.com/ilyagr/diffedit3
+[gg]: https://github.com/gulbanana/gg 
+[jj_tui]: https://github.com/faldor20/jj_tui
+[lazyjj]: https://github.com/Cretezy/lazyjj
+[vjj]: https://github.com/noahmayr/vjj
+[Wiki]: https://github.com/martinvonz/jj/wiki 
diff --git a/docs/config.md b/docs/config.md
index 35ebf4e4f9..d75a5de949 100644
--- a/docs/config.md
+++ b/docs/config.md
@@ -800,6 +800,10 @@ To configure the Watchman filesystem monitor, set
 `core.fsmonitor = "watchman"`. Ensure that you have [installed the Watchman
 executable on your system](https://facebook.github.io/watchman/docs/install).
 
+You can configure `jj` to use watchman triggers to automatically create
+snapshots on filestem changes by setting
+`core.watchman.register_snapshot_trigger = true`.
+
 You can check whether Watchman is enabled and whether it is installed correctly
 using `jj debug watchman status`.
 
diff --git a/docs/design/copy-tracking.md b/docs/design/copy-tracking.md
new file mode 100644
index 0000000000..24e0d27e79
--- /dev/null
+++ b/docs/design/copy-tracking.md
@@ -0,0 +1,294 @@
+# Copy Tracking and Tracing Design
+
+Authors: [Daniel Ploch](mailto:dploch@google.com)
+
+**Summary:** This Document documents an approach to tracking and detecting copy
+information in jj repos, in a way that is compatible with both Git's detection
+model and with custom backends that have more complicated tracking of copy
+information. This design affects the output of diff commands as well as the
+results of rebasing across remote copies.
+
+## Objective
+
+Implement extensible APIs for recording and retrieving copy info for the
+purposes of diffing and rebasing across renames and copies more accurately.
+This should be performant both for Git, which synthesizes copy info on the fly
+between arbitrary trees, and for custom extensions which may explicitly record
+and re-serve copy info over arbitrarily large commit ranges.
+
+The APIs should be defined in a way that makes it easy for custom backends to
+ignore copy info entirely until they are ready to implement it.
+
+## Interface Design
+
+### Read API
+
+Copy information will be served both by a new Backend trait method described
+below, as well as a new field on Commit objects for backends that support copy
+tracking:
+
+```rust
+/// An individual copy source.
+pub struct CopySource {
+    /// The source path a target was copied from.
+    ///
+    /// It is not required that the source path is different than the target
+    /// path. A custom backend may choose to represent 'rollbacks' as copies
+    /// from a file unto itself, from a specific prior commit.
+    path: RepoPathBuf,
+    file: FileId,
+    /// The source commit the target was copied from. If not specified, then the
+    /// parent of the target commit is the source commit. Backends may use this
+    /// field to implement 'integration' logic, where a source may be
+    /// periodically merged into a target, similar to a branch, but the
+    /// branching occurs at the file level rather than the repository level. It
+    /// also follows naturally that any copy source targeted to a specific
+    /// commit should avoid copy propagation on rebasing, which is desirable
+    /// for 'fork' style copies.
+    ///
+    /// If specified, it is required that the commit id is an ancestor of the
+    /// commit with which this copy source is associated.
+    commit: Option<CommitId>,
+}
+
+pub enum CopySources {
+    Resolved(CopySource),
+    Conflict(HashSet<CopySource>),
+}
+
+/// An individual copy event, from file A -> B.
+pub struct CopyRecord {
+    /// The destination of the copy, B.
+    target: RepoPathBuf,
+    /// The CommitId where the copy took place.
+    id: CommitId,
+    /// The source of the copy, A.
+    sources: CopySources,
+}
+
+/// Backend options for fetching copy records.
+pub struct CopyRecordOpts {
+    // TODO: Probably something for git similarity detection
+}
+
+pub type CopyRecordStream = BoxStream<BackendResult<CopyRecord>>;
+
+pub trait Backend {
+    /// Get all copy records for `paths` in the dag range `roots..heads`.
+    /// 
+    /// The exact order these are returned is unspecified, but it is guaranteed
+    /// to be reverse-topological. That is, for any two copy records with
+    /// different commit ids A and B, if A is an ancestor of B, A is streamed
+    /// after B.
+    /// 
+    /// Streaming by design to better support large backends which may have very
+    /// large single-file histories. This also allows more iterative algorithms
+    /// like blame/annotate to short-circuit after a point without wasting
+    /// unnecessary resources.
+    async fn get_copy_records(&self, paths: &[RepoPathBuf], roots: &[CommitId], heads: &[CommitId]) -> CopyRecordStream;
+}
+```
+
+Obtaining copy records for a single commit requires first computing the files
+list for that commit, then calling get_copy_records with `heads = [id]` and
+`roots = parents()`. This enables commands like `jj diff` to produce better
+diffs that take copy sources into account.
+
+### Write API
+
+Backends that support tracking copy records at the commit level will do so
+through a new field on `backend::Commit` objects:
+
+```rust
+pub struct Commit {
+    ...
+    copies: Option<HashMap<RepoPathBuf, CopySources>>,
+}
+
+pub trait Backend {
+    /// Whether this backend supports storing explicit copy records on write.
+    fn supports_copy_tracking(&self) -> bool;
+}
+```
+
+This field will be ignored by backends that do not support copy tracking, and
+always set to `None` when read from such backends. Backends that do support copy
+tracking are required to preserve the field value always.
+
+This API will enable the creation of new `jj` commands for recording copies:
+
+```shell
+jj cp $SRC $DEST [OPTIONS]
+jj mv $SRC $DEST [OPTIONS]
+```
+
+These commands will rewrite the target commit to reflect the given move/copy
+instructions in its tree, as well as recording the rewrites on the Commit
+object itself for backends that support it (for backends that do not,
+these copy records will be silently discarded).
+
+Flags for the first two commands will include:
+
+```
+-r/--revision
+    perform the copy or move at the specified revision
+    defaults to the working copy commit if unspecified
+-f
+    force overwrite the destination path
+--after
+    record the copy retroactively, without modifying the targeted commit tree
+--resolve
+    overwrite all previous copy intents for this $DEST
+--allow-ignore-copy
+    don't error if the backend doesn't support copy tracking
+--from REV
+    specify a commit id for the copy source that isn't the parent commit
+```
+
+For backends which do not support copy tracking, it will be an error to use
+`--after`, since this has no effect on anything and the user should know that.
+The `supports_copy_tracking()` trait method is used to determine this.
+
+An additional command is provided to deliberately discard copy info for a
+destination path, possibly as a means of resolving a conflict.
+
+```shell
+jj forget-cp $DEST [-r REV]
+```
+
+## Behavioral Changes
+
+### Rebase Changes
+
+In general, we want to support the following use cases:
+
+-   A rebase of an edited file A across a rename of A->B should transparently move the edits to B.
+-   A rebase of an edited file A across a copy from A->B should _optionally_ copy the edits to B. A configuration option should be defined to enable/disable this behavior.
+-   TODO: Others?
+
+Using the aforementioned copy tracing API, both of these should be feasible. A
+detailed approach to a specific edge case is detailed in the next section.
+
+#### Rename of an added file
+
+A well known and thorny problem in Mercurial occurs in the following scenario:
+
+1.  Create a new file A
+1.  Create new commits on top that make changes to file A
+1.  Whoops, I should rename file A to B. Do so, amend the first commit.
+1.  Because the first commit created file A, there is no rename to record; it's changing to a commit that instead creates file B.
+1.  All child commits get sad on evolve
+
+In jj, we have an opportunity to fix this because all rebasing occurs atomically
+and transactionally within memory. The exact implementation of this is yet to be
+determined, but conceptually the following should produce desirable results:
+
+1.  Rebase commit A from parents [B] to parents [C]
+1.  Get copy records from [D]->[B] and [D]->[C], where [D] are the common ancestors of [B] and [C]
+1.  DescendantRebaser maintains an in-memory map of commits to extra copy info, which it may inject into (2). When squashing a rename of a newly created file into the commit that creates that file, DescendentRebase will return this rename for all rebases of descendants of the newly modified commit. The rename lives ephemerally in memory and has no persistence after the rebase completes.
+1.  A to-be-determined algorithm diffs the copy records between [D]->[B] and [D]->[C] in order to make changes to the rebased commit. This results in edits to renamed files being propagated to those renamed files, and avoiding conflicts on the deletion of their sources. A copy/move may also be undone in this way; abandoning a commit which renames A->B should move all descendant edits of B back into A.
+
+### Conflicts
+
+With copy-tracking, a whole new class of conflicts become possible. These need
+to be well-defined and have well documented resolution paths. Because copy info
+in a commit is keyed by _destination_, conflicts can only occur at the
+_destination_ of a copy, not at a source (that's called forking).
+
+#### Split conflicts
+
+Suppose we create commit A by renaming file F1 -> F2, then we split A. What
+happens to the copy info? I argue that this is straightforward:
+
+-   If F2 is preserved at all in the parent commit, the copy info stays on the parent commit.
+-   Otherwise, the copy info goes onto the child commit.
+
+Things get a little messier if A _also_ modifies F1, and this modification is
+separated from the copy, but I think this is messy only in an academic sense and
+the user gets a sane result either way. If they want to separate the
+modification from the copy while still putting it in an earlier commit, they can
+express this intent after with `jj cp --after --from`.
+
+#### Merge commit conflicts
+
+Suppose we create commit A by renaming file F1 -> F, then we create a sibling
+commit B by renaming file F2 -> F. What happens when we create a merge commit
+with parents A and B?
+
+In terms of _copy info_ there is no conflict here, because C does not have copy
+info and needs none, but resolving the contents of F becomes more complicated.
+We need to (1) identify the greatest common ancestor of A and B (D)
+(which we do anyway), and (2) invoke `get_copy_records()` on F for each of
+`D::A` and `D::B` to identify the 'real' source file id for each parent. If
+these are the same, then we can use that as the base for a better 3-way merge.
+Otherwise, we must treat it as an add+add conflict where the base is the empty
+file id.
+
+It is possible that F1 and F2 both came from a common source file G, but that
+these copies precede D. In such case, we will not produce as good of a merge
+resolution as we theoretically could, but (1) this seems extremely niche and
+unlikely, and (2) we cannot reasonably achieve this without implementing some
+analogue of Mercurial's linknodes concept, and it would be nice to avoid that
+additional complexity.
+
+#### Squash conflicts
+
+Suppose we create commit A by renaming file F1 -> F, then we create child
+commit B in which we replace F by renaming F2 -> F. This touches on two issues.
+
+Firstly, if these two commits are squashed together, then we have a destination
+F with two copy sources, F1 and F2. In this case, we can store a
+`CopySources::Conflict([F1, F2])` as the copy source for F, and treat this
+commit as 'conflicted' in `jj log`. `jj status` will need modification to show
+this conflicted state, and `jj resolve` will need some way of handling the
+conflicted copy sources (possibly printing them in some structured text form,
+and using the user's merge tool to resolve them). Alternatively, the user can
+'resolve directly' by running `jj cp --after --resolve` with the desired copy
+info.
+
+Secondly, who is to say that commit B is 'replacing' F at all? In some version
+control systems, it is possible to 'integrate' a file X into an existing file Y,
+by e.g. propagating changes in X since its previous 'integrate' into Y, without
+erasing Y's prior history in that moment for the purpose of archaeology. With
+the commit metadata currently defined, it is not possible to distinguish
+between a 'replacement' operation and an 'integrate' operation.
+
+##### Track replacements explicitly
+
+One solution is to add a `destructive: bool` field or similar to the
+`CopySource` struct, to explicitly distinguish between these two types of copy
+records. It then becomes possible to record a non-destructive copy using
+`--after` to recognize that a file F was 'merged into' its destination, which
+can be useful in handling parallel edits of F that later sync this information.
+
+##### Always assume replacement
+
+Alternatively, we can keep copy-tracking simple in jj by taking a stronger
+stance here and treating all copies-onto-existing-files as 'replacement'
+operations. This makes integrations with more complex VCSs that do support
+'integrate'-style operations trickier, but it is possible that a more generic
+commit extension system is better suited to such backends.
+
+### Future Changes
+
+An implementation of `jj blame` or `jj annotate` does not currently exist, but
+when it does we'll definitely want it to be copy-tracing aware to provide
+better annotations for users doing archaeology. The Read APIs provided are
+expected to be sufficient for these use cases.
+
+## Non-goals
+
+### Tracking copies in Git
+
+Git uses rename detection rather than copy tracking, generating copy info on
+the fly between two arbitrary trees. It does not have any place for explicit
+copy info that _exchanges_ with other users of the same git repo, so any
+enhancements jj adds here would be local only and could potentially introduce
+confusion when collaborating with other users.
+
+### Directory copies/moves
+
+All copy/move information will be read and written at the file level. While
+`jj cp|mv` may accept directory paths as a convenience and perform the
+appropriate tree modification operations, the renames will be recorded at the
+file level, one for each copied/moved file.
diff --git a/docs/filesets.md b/docs/filesets.md
index 9735a87903..567aec0b1c 100644
--- a/docs/filesets.md
+++ b/docs/filesets.md
@@ -74,7 +74,7 @@ jj diff '~Cargo.lock'
 List files in `src` excluding Rust sources.
 
 ```
-jj files 'src ~ glob:"**/*.rs"'
+jj file list 'src ~ glob:"**/*.rs"'
 ```
 
 Split a revision in two, putting `foo` into the second commit.
diff --git a/docs/git-comparison.md b/docs/git-comparison.md
index dbda867610..03c17af100 100644
--- a/docs/git-comparison.md
+++ b/docs/git-comparison.md
@@ -196,7 +196,7 @@ parent.
     </tr>
     <tr>
       <td>Search among files versioned in the repository</td>
-      <td><code>grep foo $(jj files)</code>, or <code>rg --no-require-git foo</code></td>
+      <td><code>grep foo $(jj file list)</code>, or <code>rg --no-require-git foo</code></td>
       <td><code>git grep foo</code></td>
     </tr>
     <tr>
diff --git a/docs/revsets.md b/docs/revsets.md
index 8458a7f47c..b7676ec561 100644
--- a/docs/revsets.md
+++ b/docs/revsets.md
@@ -52,18 +52,22 @@ only symbols.
 
 * `x-`: Parents of `x`, can be empty.
 * `x+`: Children of `x`, can be empty.
-* `x::`: Descendants of `x`, including the commits in `x` itself.
-* `x..`: Revisions that are not ancestors of `x`.
-* `::x`: Ancestors of `x`, including the commits in `x` itself.
+* `x::`: Descendants of `x`, including the commits in `x` itself. Shorthand for
+  `x::visible_heads()`.
+* `x..`: Revisions that are not ancestors of `x`. Shorthand for
+  `x..visible_heads()`.
+* `::x`: Ancestors of `x`, including the commits in `x` itself. Shorthand for
+  `root()::x`.
 * `..x`: Ancestors of `x`, including the commits in `x` itself, but excluding
-  the root commit. Equivalent to `::x ~ root()`.
+  the root commit. Shorthand for `root()..x`. Equivalent to `::x ~ root()`.
 * `x::y`: Descendants of `x` that are also ancestors of `y`. Equivalent
    to `x:: & ::y`. This is what `git log` calls `--ancestry-path x..y`.
 * `x..y`: Ancestors of `y` that are not also ancestors of `x`. Equivalent to
   `::y ~ ::x`. This is what `git log` calls `x..y` (i.e. the same as we call it).
-* `::`: All visible commits in the repo. Equivalent to `all()`.
+* `::`: All visible commits in the repo. Shorthand for
+  `root()::visible_heads()`. Equivalent to `all()`.
 * `..`: All visible commits in the repo, but excluding the root commit.
-  Equivalent to `~root()`.
+  Shorthand for `root()..visible_heads()`. Equivalent to `~root()`.
 * `~x`: Revisions that are not in `x`.
 * `x & y`: Revisions that are in both `x` and `y`.
 * `x ~ y`: Revisions that are in `x` but not in `y`.
@@ -74,6 +78,97 @@ only symbols.
 You can use parentheses to control evaluation order, such as `(x & y) | z` or
 `x & (y | z)`.
 
+??? examples
+
+    Given this history:
+    ```
+    D
+    |\
+    | o C
+    | |
+    o | B
+    |/
+    o A
+    |
+    o root()
+    ```
+
+    **Operator** `x-`
+
+    * `D-` ⇒ `{C,B}`
+    * `B-` ⇒ `{A}`
+    * `A-` ⇒ `{root()}`
+    * `root()-` ⇒ `{}` (empty set)
+    * `none()-` ⇒ `{}` (empty set)
+    * `(D|A)-` ⇒ `{C,B,root()}`
+    * `(C|B)-` ⇒ `{A}`
+
+    **Operator** `x+`
+
+    * `D+` ⇒ `{}` (empty set)
+    * `B+` ⇒ `{D}`
+    * `A+` ⇒ `{B,C}`
+    * `root()+` ⇒ `{A}`
+    * `none()+` ⇒ `{}` (empty set)
+    * `(C|B)+` ⇒ `{D}`
+    * `(B|root())+` ⇒ `{D,A}`
+
+    **Operator** `x::`
+
+    * `D::` ⇒ `{D}`
+    * `B::` ⇒ `{D,B}`
+    * `A::` ⇒ `{D,C,B,A}`
+    * `root()::` ⇒ `{D,C,B,A,root()}`
+    * `none()::` ⇒ `{}` (empty set)
+    * `(C|B)::` ⇒ `{D,C,B}`
+
+    **Operator** `x..`
+
+    * `D..` ⇒ `{}` (empty set)
+    * `B..` ⇒ `{D,C}` (note that, unlike `B::`, this includes `C`)
+    * `A..` ⇒ `{D,C,B}`
+    * `root()..` ⇒ `{D,C,B,A}`
+    * `none()..` ⇒ `{D,C,B,A,root()}`
+    * `(C|B)..` ⇒ `{D}`
+
+    **Operator** `::x`
+
+    * `::D` ⇒ `{D,C,B,A,root()}`
+    * `::B` ⇒ `{B,A,root()}`
+    * `::A` ⇒ `{A,root()}`
+    * `::root()` ⇒ `{root()}`
+    * `::none()` ⇒ `{}` (empty set)
+    * `::(C|B)` ⇒ `{C,B,A,root()}`
+
+    **Operator** `..x`
+
+    * `..D` ⇒ `{D,C,B,A}`
+    * `..B` ⇒ `{B,A}`
+    * `..A` ⇒ `{A}`
+    * `..root()` ⇒ `{}` (empty set)
+    * `..none()` ⇒ `{}` (empty set)
+    * `..(C|B)` ⇒ `{C,B,A}`
+
+    **Operator** `x::y`
+
+    * `D::D` ⇒ `{D}`
+    * `B::D` ⇒ `{D,B}` (note that, unlike `B..D`, this includes `B` and excludes `C`)
+    * `A::D` ⇒ `{D,C,B,A}`
+    * `root()::D` ⇒ `{D,C,B,A,root()}`
+    * `none()::D` ⇒ `{}` (empty set)
+    * `D::B` ⇒ `{}` (empty set)
+    * `(C|B)::(C|B)` ⇒ `{C,B}`
+
+    **Operator** `x..y`
+
+    * `D..D` ⇒ `{}` (empty set)
+    * `B..D` ⇒ `{D,C}` (note that, unlike `B::D`, this includes `C` and excludes `B`)
+    * `A..D` ⇒ `{D,C,B}`
+    * `root()..D` ⇒ `{D,C,B,A}`
+    * `none()..D` ⇒ `{D,C,B,A,root()}`
+    * `D..B` ⇒ `{}` (empty set)
+    * `(C|B)..(C|B)` ⇒ `{}` (empty set)
+
 ## Functions
 
 You can also specify revisions by using functions. Some functions take other
@@ -181,6 +276,53 @@ given [string pattern](#string-patterns).
 
 * `working_copies()`: The working copy commits across all the workspaces.
 
+??? examples
+
+    Given this history:
+    ```
+    E
+    |
+    | D
+    |/|
+    | o C
+    | |
+    o | B
+    |/
+    o A
+    |
+    o root()
+    ```
+
+    **function** `reachable()`
+
+    * `reachable(E, A..)` ⇒ `{E,D,C,B}`
+    * `reachable(D, A..)` ⇒ `{E,D,C,B}`
+    * `reachable(C, A..)` ⇒ `{E,D,C,B}`
+    * `reachable(B, A..)` ⇒ `{E,D,C,B}`
+    * `reachable(A, A..)` ⇒ `{}` (empty set)
+
+    **function** `connected()`
+
+    * `connected(E|A)` ⇒ `{E,B,A}`
+    * `connected(D|A)` ⇒ `{D,C,B,A}`
+    * `connected(A)` ⇒ `{A}`
+
+    **function** `heads()`
+
+    * `heads(E|D)` ⇒ `{E,D}`
+    * `heads(E|C)` ⇒ `{E,C}`
+    * `heads(E|B)` ⇒ `{E}`
+    * `heads(E|A)` ⇒ `{E}`
+    * `heads(A)` ⇒ `{A}`
+
+    **function** `roots()`
+
+    * `roots(E|D)` ⇒ `{E,D}`
+    * `roots(E|C)` ⇒ `{E,C}`
+    * `roots(E|B)` ⇒ `{B}`
+    * `roots(E|A)` ⇒ `{A}`
+    * `roots(A)` ⇒ `{A}`
+
 ## String patterns
 
 Functions that perform string matching support the following pattern syntax:
@@ -196,11 +338,15 @@ Functions that perform string matching support the following pattern syntax:
 New symbols and functions can be defined in the config file, by using any
 combination of the predefined symbols/functions and other aliases.
 
+Alias functions can be overloaded by the number of parameters. However, builtin
+function will be shadowed by name, and can't co-exist with aliases.
+
 For example:
 
 ```toml
 [revset-aliases]
 'HEAD' = '@-'
+'user()' = 'user("me@example.org")
 'user(x)' = 'author(x) | committer(x)'
 ```
 
diff --git a/docs/sapling-comparison.md b/docs/sapling-comparison.md
index de1c6b9803..cf4ba27c98 100644
--- a/docs/sapling-comparison.md
+++ b/docs/sapling-comparison.md
@@ -3,10 +3,11 @@
 ## Introduction
 
 This document attempts to describe how jj is different
-from [Sapling](https://sapling-scm.com). Sapling is a VCS developed by Meta. It is a
-heavily modified fork of [Mercurial](https://www.mercurial-scm.org/). Because
-jj has copied many ideas from Mercurial, there are many similarities between the
-two tools, such as:
+from [Sapling](https://sapling-scm.com). Sapling is a VCS developed by Meta. It
+was announced about 3 years after development started on jj. It is a heavily
+modified fork of [Mercurial](https://www.mercurial-scm.org/). Because jj has
+copied many ideas from Mercurial, there are many similarities between the two
+tools, such as:
 
 * A user-friendly CLI
 * A "[revset](revsets.md)" language for selecting revisions
diff --git a/docs/templates.md b/docs/templates.md
index e217bc7574..6317925514 100644
--- a/docs/templates.md
+++ b/docs/templates.md
@@ -273,6 +273,9 @@ can be seen in the `cli/src/config/templates.toml` file in jj's source tree.
 New keywords and functions can be defined as aliases, by using any
 combination of the predefined keywords/functions and other aliases.
 
+Alias functions can be overloaded by the number of parameters. However, builtin
+function will be shadowed by name, and can't co-exist with aliases.
+
 For example:
 
 ```toml
diff --git a/flake.lock b/flake.lock
index 1e341b4beb..96870b2ef3 100644
--- a/flake.lock
+++ b/flake.lock
@@ -20,11 +20,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1718089647,
-        "narHash": "sha256-COO4Xk2EzlZ3x9KCiJildlAA6cYDSPlnY8ms7pKl2Iw=",
+        "lastModified": 1719082008,
+        "narHash": "sha256-jHJSUH619zBQ6WdC21fFAlDxHErKVDJ5fpN0Hgx4sjs=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "f7207adcc68d9cafa29e3cd252a18743ae512c6a",
+        "rev": "9693852a2070b398ee123a329e68f0dab5526681",
         "type": "github"
       },
       "original": {
@@ -41,19 +41,16 @@
     },
     "rust-overlay": {
       "inputs": {
-        "flake-utils": [
-          "flake-utils"
-        ],
         "nixpkgs": [
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1718072316,
-        "narHash": "sha256-p33h73iQ1HkLalCplV5MH0oP3HXRaH3zufnFqb5//ps=",
+        "lastModified": 1719281921,
+        "narHash": "sha256-LIBMfhM9pMOlEvBI757GOK5l0R58SRi6YpwfYMbf4yc=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "bedc47af18fc41bb7d2edc2b212d59ca36253f59",
+        "rev": "b6032d3a404d8a52ecfc8571ff0c26dfbe221d07",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 7b769e9048..bbafd1cde1 100644
--- a/flake.nix
+++ b/flake.nix
@@ -8,7 +8,6 @@
     # For installing non-standard rustc versions
     rust-overlay.url = "github:oxalica/rust-overlay";
     rust-overlay.inputs.nixpkgs.follows = "nixpkgs";
-    rust-overlay.inputs.flake-utils.follows = "flake-utils";
   };
 
   outputs = { self, nixpkgs, flake-utils, rust-overlay }: {
@@ -151,15 +150,15 @@
           openssl zstd libgit2 libssh2
           pkg-config
 
-          # Make sure rust-analyzer is present
-          rust-analyzer
-
           # Additional tools recommended by contributing.md
           cargo-deny
           cargo-insta
           cargo-nextest
           cargo-watch
 
+          # Miscellaneous tools
+          watchman
+
           # In case you need to run `cargo run --bin gen-protos`
           protobuf
 
diff --git a/lib/src/backend.rs b/lib/src/backend.rs
index 03be444fa7..29e94a672a 100644
--- a/lib/src/backend.rs
+++ b/lib/src/backend.rs
@@ -27,7 +27,7 @@ use crate::content_hash::ContentHash;
 use crate::index::Index;
 use crate::merge::Merge;
 use crate::object_id::{id_type, ObjectId};
-use crate::repo_path::{RepoPath, RepoPathComponent, RepoPathComponentBuf};
+use crate::repo_path::{RepoPath, RepoPathBuf, RepoPathComponent, RepoPathComponentBuf};
 use crate::signing::SignResult;
 
 id_type!(
@@ -199,6 +199,12 @@ pub enum BackendError {
         hash: String,
         source: Box<dyn std::error::Error + Send + Sync>,
     },
+    #[error("Error when reading file content for file {} with id {}", path.as_internal_file_string(), id.hex())]
+    ReadFile {
+        path: RepoPathBuf,
+        id: FileId,
+        source: Box<dyn std::error::Error + Send + Sync>,
+    },
     #[error("Could not write object of type {object_type}")]
     WriteObject {
         object_type: &'static str,
diff --git a/lib/src/conflicts.rs b/lib/src/conflicts.rs
index 86a9a557ee..4da59c809c 100644
--- a/lib/src/conflicts.rs
+++ b/lib/src/conflicts.rs
@@ -17,7 +17,7 @@
 use std::io::{Read, Write};
 use std::iter::zip;
 
-use futures::StreamExt;
+use futures::{StreamExt, TryStreamExt};
 use itertools::Itertools;
 use regex::bytes::Regex;
 
@@ -77,21 +77,28 @@ fn write_diff_hunks(hunks: &[DiffHunk], file: &mut dyn Write) -> std::io::Result
     Ok(())
 }
 
-async fn get_file_contents(store: &Store, path: &RepoPath, term: &Option<FileId>) -> ContentHunk {
+async fn get_file_contents(
+    store: &Store,
+    path: &RepoPath,
+    term: &Option<FileId>,
+) -> BackendResult<ContentHunk> {
     match term {
         Some(id) => {
             let mut content = vec![];
             store
                 .read_file_async(path, id)
-                .await
-                .unwrap()
+                .await?
                 .read_to_end(&mut content)
-                .unwrap();
-            ContentHunk(content)
+                .map_err(|err| BackendError::ReadFile {
+                    path: path.to_owned(),
+                    id: id.clone(),
+                    source: err.into(),
+                })?;
+            Ok(ContentHunk(content))
         }
         // If the conflict had removed the file on one side, we pretend that the file
         // was empty there.
-        None => ContentHunk(vec![]),
+        None => Ok(ContentHunk(vec![])),
     }
 }
 
@@ -99,28 +106,12 @@ pub async fn extract_as_single_hunk(
     merge: &Merge<Option<FileId>>,
     store: &Store,
     path: &RepoPath,
-) -> Merge<ContentHunk> {
+) -> BackendResult<Merge<ContentHunk>> {
     let builder: MergeBuilder<ContentHunk> = futures::stream::iter(merge.iter())
         .then(|term| get_file_contents(store, path, term))
-        .collect()
-        .await;
-    builder.build()
-}
-
-pub async fn materialize(
-    conflict: &MergedTreeValue,
-    store: &Store,
-    path: &RepoPath,
-    output: &mut dyn Write,
-) -> std::io::Result<()> {
-    if let Some(file_merge) = conflict.to_file_merge() {
-        let content = extract_as_single_hunk(&file_merge, store, path).await;
-        materialize_merge_result(&content, output)
-    } else {
-        // Unless all terms are regular files, we can't do much better than to try to
-        // describe the merge.
-        conflict.describe(output)
-    }
+        .try_collect()
+        .await?;
+    Ok(builder.build())
 }
 
 /// A type similar to `MergedTreeValue` but with associated data to include in
@@ -197,9 +188,18 @@ async fn materialize_tree_value_no_access_denied(
         }
         Err(conflict) => {
             let mut contents = vec![];
-            materialize(&conflict, store, path, &mut contents)
-                .await
-                .expect("Failed to materialize conflict to in-memory buffer");
+            if let Some(file_merge) = conflict.to_file_merge() {
+                let file_merge = file_merge.simplify();
+                let content = extract_as_single_hunk(&file_merge, store, path).await?;
+                materialize_merge_result(&content, &mut contents)
+                    .expect("Failed to materialize conflict to in-memory buffer");
+            } else {
+                // Unless all terms are regular files, we can't do much better than to try to
+                // describe the merge.
+                conflict
+                    .describe(&mut contents)
+                    .expect("Failed to materialize conflict to in-memory buffer");
+            }
             let executable = if let Some(merge) = conflict.to_executable_merge() {
                 merge.resolve_trivial().copied().unwrap_or_default()
             } else {
@@ -259,7 +259,7 @@ pub fn materialize_merge_result(
                             output.write_all(&left.0)?;
                             continue;
                         };
-                        let diff1 = Diff::for_tokenizer(&[&left.0, &right1.0], &find_line_ranges)
+                        let diff1 = Diff::for_tokenizer(&[&left.0, &right1.0], find_line_ranges)
                             .hunks()
                             .collect_vec();
                         // Check if the diff against the next positive term is better. Since
@@ -267,7 +267,7 @@ pub fn materialize_merge_result(
                         // any later positive terms.
                         if let Some(right2) = hunk.get_add(add_index + 1) {
                             let diff2 =
-                                Diff::for_tokenizer(&[&left.0, &right2.0], &find_line_ranges)
+                                Diff::for_tokenizer(&[&left.0, &right2.0], find_line_ranges)
                                     .hunks()
                                     .collect_vec();
                             if diff_size(&diff2) < diff_size(&diff1) {
@@ -451,24 +451,40 @@ pub async fn update_from_content(
     path: &RepoPath,
     content: &[u8],
 ) -> BackendResult<Merge<Option<FileId>>> {
+    let simplified_file_ids = file_ids.clone().simplify();
+    let simplified_file_ids = &simplified_file_ids;
+
     // First check if the new content is unchanged compared to the old content. If
     // it is, we don't need parse the content or write any new objects to the
     // store. This is also a way of making sure that unchanged tree/file
     // conflicts (for example) are not converted to regular files in the working
     // copy.
     let mut old_content = Vec::with_capacity(content.len());
-    let merge_hunk = extract_as_single_hunk(file_ids, store, path).await;
+    let merge_hunk = extract_as_single_hunk(simplified_file_ids, store, path).await?;
     materialize_merge_result(&merge_hunk, &mut old_content).unwrap();
     if content == old_content {
         return Ok(file_ids.clone());
     }
 
-    let Some(hunks) = parse_conflict(content, file_ids.num_sides()) else {
-        // Either there are no self markers of they don't have the expected arity
+    // Parse conflicts from the new content using the arity of the simplified
+    // conflicts initially. If unsuccessful, attempt to parse conflicts from with
+    // the arity of the unsimplified conflicts since such a conflict may be
+    // present in the working copy if written by an earlier version of jj.
+    let (used_file_ids, hunks) = 'hunks: {
+        if let Some(hunks) = parse_conflict(content, simplified_file_ids.num_sides()) {
+            break 'hunks (simplified_file_ids, hunks);
+        };
+        if simplified_file_ids.num_sides() != file_ids.num_sides() {
+            if let Some(hunks) = parse_conflict(content, file_ids.num_sides()) {
+                break 'hunks (file_ids, hunks);
+            };
+        };
+        // Either there are no markers or they don't have the expected arity
         let file_id = store.write_file(path, &mut &content[..])?;
         return Ok(Merge::normal(file_id));
     };
-    let mut contents = file_ids.map(|_| vec![]);
+
+    let mut contents = used_file_ids.map(|_| vec![]);
     for hunk in hunks {
         if let Some(slice) = hunk.as_resolved() {
             for content in contents.iter_mut() {
@@ -483,7 +499,7 @@ pub async fn update_from_content(
 
     // If the user edited the empty placeholder for an absent side, we consider the
     // conflict resolved.
-    if zip(contents.iter(), file_ids.iter())
+    if zip(contents.iter(), used_file_ids.iter())
         .any(|(content, file_id)| file_id.is_none() && !content.is_empty())
     {
         let file_id = store.write_file(path, &mut &content[..])?;
@@ -491,22 +507,31 @@ pub async fn update_from_content(
     }
 
     // Now write the new files contents we found by parsing the file with conflict
-    // markers. Update the Merge object with the new FileIds.
-    let builder: BackendResult<MergeBuilder<Option<FileId>>> =
-        zip(contents.iter(), file_ids.iter())
-            .map(|(content, file_id)| {
-                match file_id {
-                    Some(_) => {
-                        let file_id = store.write_file(path, &mut content.as_slice())?;
-                        Ok(Some(file_id))
-                    }
-                    None => {
-                        // The missing side of a conflict is still represented by
-                        // the empty string we materialized it as
-                        Ok(None)
-                    }
+    // markers.
+    let new_file_ids: Vec<Option<FileId>> = zip(contents.iter(), used_file_ids.iter())
+        .map(|(content, file_id)| -> BackendResult<Option<FileId>> {
+            match file_id {
+                Some(_) => {
+                    let file_id = store.write_file(path, &mut content.as_slice())?;
+                    Ok(Some(file_id))
                 }
-            })
-            .collect();
-    Ok(builder?.build())
+                None => {
+                    // The missing side of a conflict is still represented by
+                    // the empty string we materialized it as
+                    Ok(None)
+                }
+            }
+        })
+        .try_collect()?;
+
+    // If the conflict was simplified, expand the conflict to the original
+    // number of sides.
+    let new_file_ids = if new_file_ids.len() != file_ids.iter().len() {
+        file_ids
+            .clone()
+            .update_from_simplified(Merge::from_vec(new_file_ids))
+    } else {
+        Merge::from_vec(new_file_ids)
+    };
+    Ok(new_file_ids)
 }
diff --git a/lib/src/dag_walk.rs b/lib/src/dag_walk.rs
index c773fafe34..512d6059ad 100644
--- a/lib/src/dag_walk.rs
+++ b/lib/src/dag_walk.rs
@@ -486,17 +486,30 @@ where
     II: IntoIterator<Item = Result<T, E>>,
     NI: IntoIterator<Item = Result<T, E>>,
 {
-    let start: Vec<T> = start.into_iter().try_collect()?;
-    let mut reachable: HashSet<T> = start.iter().cloned().collect();
-    dfs_ok(start.into_iter().map(Ok), id_fn, |node| {
-        let neighbors: Vec<Result<T, E>> = neighbors_fn(node).into_iter().collect();
-        for neighbor in neighbors.iter().filter_map(|x| x.as_ref().ok()) {
-            reachable.remove(neighbor);
+    let mut heads: HashSet<T> = start.into_iter().try_collect()?;
+    // Do a BFS until we have only one item left in the frontier. That frontier must
+    // have originated from one of the heads, and since there can't be cycles,
+    // it won't be able to eliminate any other heads.
+    let mut frontier: Vec<T> = heads.iter().cloned().collect();
+    let mut visited: HashSet<ID> = heads.iter().map(&id_fn).collect();
+    let mut root_reached = false;
+    while frontier.len() > 1 || (!frontier.is_empty() && root_reached) {
+        frontier = frontier
+            .iter()
+            .flat_map(|node| {
+                let neighbors = neighbors_fn(node).into_iter().collect_vec();
+                if neighbors.is_empty() {
+                    root_reached = true;
+                }
+                neighbors
+            })
+            .try_collect()?;
+        for node in &frontier {
+            heads.remove(node);
         }
-        neighbors
-    })
-    .try_for_each(|r| r.map(|_| ()))?;
-    Ok(reachable)
+        frontier.retain(|node| visited.insert(id_fn(node)));
+    }
+    Ok(heads)
 }
 
 /// Finds the closest common neighbor among the `set1` and `set2`.
@@ -1211,10 +1224,14 @@ mod tests {
         let neighbors_fn = |node: &char| neighbors[node].clone();
 
         let result = heads_ok([Ok('C')], id_fn, neighbors_fn);
-        assert_eq!(result, Err('X'));
+        assert_eq!(result, Ok(hashset! {'C'}));
         let result = heads_ok([Ok('B')], id_fn, neighbors_fn);
-        assert_eq!(result, Err('X'));
+        assert_eq!(result, Ok(hashset! {'B'}));
         let result = heads_ok([Ok('A')], id_fn, neighbors_fn);
         assert_eq!(result, Ok(hashset! {'A'}));
+        let result = heads_ok([Ok('C'), Ok('B')], id_fn, neighbors_fn);
+        assert_eq!(result, Err('X'));
+        let result = heads_ok([Ok('C'), Ok('A')], id_fn, neighbors_fn);
+        assert_eq!(result, Err('X'));
     }
 }
diff --git a/lib/src/default_index/revset_engine.rs b/lib/src/default_index/revset_engine.rs
index 9afbbdd9bc..13a93e79a0 100644
--- a/lib/src/default_index/revset_engine.rs
+++ b/lib/src/default_index/revset_engine.rs
@@ -33,7 +33,7 @@ use crate::matchers::{Matcher, Visit};
 use crate::repo_path::RepoPath;
 use crate::revset::{
     ResolvedExpression, ResolvedPredicateExpression, Revset, RevsetEvaluationError,
-    RevsetFilterExtensionWrapper, RevsetFilterPredicate, GENERATION_RANGE_FULL,
+    RevsetFilterPredicate, GENERATION_RANGE_FULL,
 };
 use crate::store::Store;
 use crate::{rewrite, union_find};
@@ -1081,7 +1081,7 @@ fn build_predicate_fn(
             let commit = store.get_commit(&entry.commit_id()).unwrap();
             commit.has_conflict().unwrap()
         }),
-        RevsetFilterPredicate::Extension(RevsetFilterExtensionWrapper(ext)) => {
+        RevsetFilterPredicate::Extension(ext) => {
             let ext = ext.clone();
             box_pure_predicate_fn(move |index, pos| {
                 let entry = index.entry_by_pos(pos);
diff --git a/lib/src/diff.rs b/lib/src/diff.rs
index d67dd535a7..6015b27892 100644
--- a/lib/src/diff.rs
+++ b/lib/src/diff.rs
@@ -23,23 +23,13 @@ use std::slice;
 use itertools::Itertools;
 
 pub fn find_line_ranges(text: &[u8]) -> Vec<Range<usize>> {
-    let mut ranges = vec![];
-    let mut start = 0;
-    loop {
-        match text[start..].iter().position(|b| *b == b'\n') {
-            None => {
-                break;
-            }
-            Some(i) => {
-                ranges.push(start..start + i + 1);
-                start += i + 1;
-            }
-        }
-    }
-    if start < text.len() {
-        ranges.push(start..text.len());
-    }
-    ranges
+    text.split_inclusive(|b| *b == b'\n')
+        .scan(0, |total, line| {
+            let start = *total;
+            *total += line.len();
+            Some(start..*total)
+        })
+        .collect()
 }
 
 fn is_word_byte(b: u8) -> bool {
@@ -73,13 +63,10 @@ pub fn find_word_ranges(text: &[u8]) -> Vec<Range<usize>> {
 }
 
 pub fn find_nonword_ranges(text: &[u8]) -> Vec<Range<usize>> {
-    let mut ranges = vec![];
-    for (i, b) in text.iter().enumerate() {
-        if !is_word_byte(*b) {
-            ranges.push(i..i + 1);
-        }
-    }
-    ranges
+    text.iter()
+        .positions(|b| !is_word_byte(*b))
+        .map(|i| i..i + 1)
+        .collect()
 }
 
 struct Histogram<'a> {
@@ -395,7 +382,7 @@ fn intersect_regions(
 impl<'input> Diff<'input> {
     pub fn for_tokenizer(
         inputs: &[&'input [u8]],
-        tokenizer: &impl Fn(&[u8]) -> Vec<Range<usize>>,
+        tokenizer: impl Fn(&[u8]) -> Vec<Range<usize>>,
     ) -> Self {
         assert!(!inputs.is_empty());
         let base_input = inputs[0];
@@ -444,7 +431,7 @@ impl<'input> Diff<'input> {
     }
 
     pub fn unrefined(inputs: &[&'input [u8]]) -> Self {
-        Diff::for_tokenizer(inputs, &|_| vec![])
+        Diff::for_tokenizer(inputs, |_| vec![])
     }
 
     // TODO: At least when merging, it's wasteful to refine the diff if e.g. if 2
@@ -454,9 +441,9 @@ impl<'input> Diff<'input> {
     // probably mean that many callers repeat the same code. Perhaps it
     // should be possible to refine a whole diff *or* individual hunks.
     pub fn default_refinement(inputs: &[&'input [u8]]) -> Self {
-        let mut diff = Diff::for_tokenizer(inputs, &find_line_ranges);
-        diff.refine_changed_regions(&find_word_ranges);
-        diff.refine_changed_regions(&find_nonword_ranges);
+        let mut diff = Diff::for_tokenizer(inputs, find_line_ranges);
+        diff.refine_changed_regions(find_word_ranges);
+        diff.refine_changed_regions(find_nonword_ranges);
         diff
     }
 
@@ -475,7 +462,7 @@ impl<'input> Diff<'input> {
 
     /// Uses the given tokenizer to split the changed regions into smaller
     /// regions. Then tries to finds unchanged regions among them.
-    pub fn refine_changed_regions(&mut self, tokenizer: &impl Fn(&[u8]) -> Vec<Range<usize>>) {
+    pub fn refine_changed_regions(&mut self, tokenizer: impl Fn(&[u8]) -> Vec<Range<usize>>) {
         let mut previous = UnchangedRange {
             base_range: 0..0,
             offsets: vec![0; self.other_inputs.len()],
@@ -493,7 +480,7 @@ impl<'input> Diff<'input> {
                 slices.push(&self.other_inputs[i][changed_range]);
             }
 
-            let refined_diff = Diff::for_tokenizer(&slices, tokenizer);
+            let refined_diff = Diff::for_tokenizer(&slices, &tokenizer);
 
             for UnchangedRange {
                 base_range,
@@ -931,7 +918,7 @@ mod tests {
         // Tests that unchanged regions are compacted when using for_tokenizer()
         let diff = Diff::for_tokenizer(
             &[b"a\nb\nc\nd\ne\nf\ng", b"a\nb\nc\nX\ne\nf\ng"],
-            &find_line_ranges,
+            find_line_ranges,
         );
         assert_eq!(
             diff.hunks().collect_vec(),
diff --git a/lib/src/dsl_util.rs b/lib/src/dsl_util.rs
index 30144ae8ee..7b21c87516 100644
--- a/lib/src/dsl_util.rs
+++ b/lib/src/dsl_util.rs
@@ -64,6 +64,11 @@ pub struct KeywordArgument<'i, T> {
 }
 
 impl<'i, T> FunctionCallNode<'i, T> {
+    /// Number of arguments assuming named arguments are all unique.
+    pub fn arity(&self) -> usize {
+        self.args.len() + self.keyword_args.len()
+    }
+
     /// Ensures that no arguments passed.
     pub fn expect_no_arguments(&self) -> Result<(), InvalidArguments<'i>> {
         let ([], []) = self.expect_arguments()?;
@@ -218,6 +223,14 @@ impl<'i, T> FunctionCallNode<'i, T> {
         };
         self.invalid_arguments(message, self.args_span)
     }
+
+    fn invalid_arguments_count_with_arities(
+        &self,
+        arities: impl IntoIterator<Item = usize>,
+    ) -> InvalidArguments<'i> {
+        let message = format!("Expected {} arguments", arities.into_iter().join(", "));
+        self.invalid_arguments(message, self.args_span)
+    }
 }
 
 /// Unexpected number of arguments, or invalid combination of arguments.
@@ -350,7 +363,8 @@ impl<R: RuleType> StringLiteralParser<R> {
 #[derive(Clone, Debug, Default)]
 pub struct AliasesMap<P> {
     symbol_aliases: HashMap<String, String>,
-    function_aliases: HashMap<String, (Vec<String>, String)>,
+    // name: [(params, defn)] (sorted by arity)
+    function_aliases: HashMap<String, Vec<(Vec<String>, String)>>,
     // Parser type P helps prevent misuse of AliasesMap of different language.
     parser: P,
 }
@@ -377,7 +391,11 @@ impl<P> AliasesMap<P> {
                 self.symbol_aliases.insert(name, defn.into());
             }
             AliasDeclaration::Function(name, params) => {
-                self.function_aliases.insert(name, (params, defn.into()));
+                let overloads = self.function_aliases.entry(name).or_default();
+                match overloads.binary_search_by_key(&params.len(), |(params, _)| params.len()) {
+                    Ok(i) => overloads[i] = (params, defn.into()),
+                    Err(i) => overloads.insert(i, (params, defn.into())),
+                }
             }
         }
         Ok(())
@@ -400,12 +418,49 @@ impl<P> AliasesMap<P> {
             .map(|(name, defn)| (AliasId::Symbol(name), defn.as_ref()))
     }
 
-    /// Looks up function alias by name. Returns identifier, list of parameter
-    /// names, and definition text.
-    pub fn get_function(&self, name: &str) -> Option<(AliasId<'_>, &[String], &str)> {
-        self.function_aliases
-            .get_key_value(name)
-            .map(|(name, (params, defn))| (AliasId::Function(name), params.as_ref(), defn.as_ref()))
+    /// Looks up function alias by name and arity. Returns identifier, list of
+    /// parameter names, and definition text.
+    pub fn get_function(&self, name: &str, arity: usize) -> Option<(AliasId<'_>, &[String], &str)> {
+        let overloads = self.get_function_overloads(name)?;
+        overloads.find_by_arity(arity)
+    }
+
+    /// Looks up function aliases by name.
+    fn get_function_overloads(&self, name: &str) -> Option<AliasFunctionOverloads<'_>> {
+        let (name, overloads) = self.function_aliases.get_key_value(name)?;
+        Some(AliasFunctionOverloads { name, overloads })
+    }
+}
+
+#[derive(Clone, Copy, Debug)]
+struct AliasFunctionOverloads<'a> {
+    name: &'a String,
+    overloads: &'a Vec<(Vec<String>, String)>,
+}
+
+impl<'a> AliasFunctionOverloads<'a> {
+    fn arities(self) -> impl DoubleEndedIterator<Item = usize> + ExactSizeIterator + 'a {
+        self.overloads.iter().map(|(params, _)| params.len())
+    }
+
+    fn min_arity(self) -> usize {
+        self.arities().next().unwrap()
+    }
+
+    fn max_arity(self) -> usize {
+        self.arities().next_back().unwrap()
+    }
+
+    fn find_by_arity(self, arity: usize) -> Option<(AliasId<'a>, &'a [String], &'a str)> {
+        let index = self
+            .overloads
+            .binary_search_by_key(&arity, |(params, _)| params.len())
+            .ok()?;
+        let (params, defn) = &self.overloads[index];
+        // Exact parameter names aren't needed to identify a function, but they
+        // provide a better error indication. (e.g. "foo(x, y)" is easier to
+        // follow than "foo/2".)
+        Some((AliasId::Function(self.name, params), params, defn))
     }
 }
 
@@ -414,8 +469,8 @@ impl<P> AliasesMap<P> {
 pub enum AliasId<'a> {
     /// Symbol name.
     Symbol(&'a str),
-    /// Function name.
-    Function(&'a str),
+    /// Function name and parameter names.
+    Function(&'a str, &'a [String]),
     /// Function parameter name.
     Parameter(&'a str),
 }
@@ -424,7 +479,9 @@ impl fmt::Display for AliasId<'_> {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         match self {
             AliasId::Symbol(name) => write!(f, "{name}"),
-            AliasId::Function(name) => write!(f, "{name}()"),
+            AliasId::Function(name, params) => {
+                write!(f, "{name}({params})", params = params.join(", "))
+            }
             AliasId::Parameter(name) => write!(f, "{name}"),
         }
     }
@@ -556,18 +613,23 @@ where
         function: Box<FunctionCallNode<'i, T>>,
         span: pest::Span<'i>,
     ) -> Result<T, Self::Error> {
-        if let Some((id, params, defn)) = self.aliases_map.get_function(function.name) {
-            // TODO: add support for keyword arguments and arity-based
-            // overloading (#2966)?
-            let arity = params.len();
+        // For better error indication, builtin functions are shadowed by name,
+        // not by (name, arity).
+        if let Some(overloads) = self.aliases_map.get_function_overloads(function.name) {
+            // TODO: add support for keyword arguments
             function
                 .ensure_no_keyword_arguments()
                 .map_err(E::invalid_arguments)?;
-            if function.args.len() != arity {
-                return Err(E::invalid_arguments(
-                    function.invalid_arguments_count(arity, Some(arity)),
-                ));
-            }
+            let Some((id, params, defn)) = overloads.find_by_arity(function.arity()) else {
+                let min = overloads.min_arity();
+                let max = overloads.max_arity();
+                let err = if max - min + 1 == overloads.arities().len() {
+                    function.invalid_arguments_count(min, Some(max))
+                } else {
+                    function.invalid_arguments_count_with_arities(overloads.arities())
+                };
+                return Err(E::invalid_arguments(err));
+            };
             // Resolve arguments in the current scope, and pass them in to the alias
             // expansion scope.
             let args = fold_expression_nodes(self, function.args)?;
diff --git a/lib/src/files.rs b/lib/src/files.rs
index a30d097870..d7ecd73e9c 100644
--- a/lib/src/files.rs
+++ b/lib/src/files.rs
@@ -165,7 +165,7 @@ pub fn merge(slices: &Merge<&[u8]>) -> MergeResult {
     let num_diffs = slices.removes().len();
     let diff_inputs = slices.removes().chain(slices.adds()).copied().collect_vec();
 
-    let diff = Diff::for_tokenizer(&diff_inputs, &diff::find_line_ranges);
+    let diff = Diff::for_tokenizer(&diff_inputs, diff::find_line_ranges);
     let mut resolved_hunk = ContentHunk(vec![]);
     let mut merge_hunks: Vec<Merge<ContentHunk>> = vec![];
     for diff_hunk in diff.hunks() {
diff --git a/lib/src/fileset.rs b/lib/src/fileset.rs
index a90f9eed8f..032373a27d 100644
--- a/lib/src/fileset.rs
+++ b/lib/src/fileset.rs
@@ -474,6 +474,22 @@ mod tests {
         RepoPathBuf::from_internal_string(value)
     }
 
+    fn insta_settings() -> insta::Settings {
+        let mut settings = insta::Settings::clone_current();
+        // Collapse short "Thing(_,)" repeatedly to save vertical space and make
+        // the output more readable.
+        for _ in 0..4 {
+            settings.add_filter(
+                r"(?x)
+                \b([A-Z]\w*)\(\n
+                    \s*(.{1,60}),\n
+                \s*\)",
+                "$1($2)",
+            );
+        }
+        settings
+    }
+
     #[test]
     fn test_parse_file_pattern() {
         let path_converter = RepoPathUiConverter::Fs {
@@ -611,6 +627,8 @@ mod tests {
 
     #[test]
     fn test_parse_function() {
+        let settings = insta_settings();
+        let _guard = settings.bind_to_scope();
         let path_converter = RepoPathUiConverter::Fs {
             cwd: PathBuf::from("/ws/cur"),
             base: PathBuf::from("/ws"),
@@ -637,6 +655,8 @@ mod tests {
 
     #[test]
     fn test_parse_compound_expression() {
+        let settings = insta_settings();
+        let _guard = settings.bind_to_scope();
         let path_converter = RepoPathUiConverter::Fs {
             cwd: PathBuf::from("/ws/cur"),
             base: PathBuf::from("/ws"),
@@ -646,53 +666,25 @@ mod tests {
         insta::assert_debug_snapshot!(parse("~x").unwrap(), @r###"
         Difference(
             All,
-            Pattern(
-                PrefixPath(
-                    "cur/x",
-                ),
-            ),
+            Pattern(PrefixPath("cur/x")),
         )
         "###);
         insta::assert_debug_snapshot!(parse("x|y|root:z").unwrap(), @r###"
         UnionAll(
             [
-                Pattern(
-                    PrefixPath(
-                        "cur/x",
-                    ),
-                ),
-                Pattern(
-                    PrefixPath(
-                        "cur/y",
-                    ),
-                ),
-                Pattern(
-                    PrefixPath(
-                        "z",
-                    ),
-                ),
+                Pattern(PrefixPath("cur/x")),
+                Pattern(PrefixPath("cur/y")),
+                Pattern(PrefixPath("z")),
             ],
         )
         "###);
         insta::assert_debug_snapshot!(parse("x|y&z").unwrap(), @r###"
         UnionAll(
             [
-                Pattern(
-                    PrefixPath(
-                        "cur/x",
-                    ),
-                ),
+                Pattern(PrefixPath("cur/x")),
                 Intersection(
-                    Pattern(
-                        PrefixPath(
-                            "cur/y",
-                        ),
-                    ),
-                    Pattern(
-                        PrefixPath(
-                            "cur/z",
-                        ),
-                    ),
+                    Pattern(PrefixPath("cur/y")),
+                    Pattern(PrefixPath("cur/z")),
                 ),
             ],
         )
@@ -734,6 +726,9 @@ mod tests {
 
     #[test]
     fn test_build_matcher_simple() {
+        let settings = insta_settings();
+        let _guard = settings.bind_to_scope();
+
         insta::assert_debug_snapshot!(FilesetExpression::none().to_matcher(), @"NothingMatcher");
         insta::assert_debug_snapshot!(FilesetExpression::all().to_matcher(), @"EverythingMatcher");
         insta::assert_debug_snapshot!(
@@ -758,6 +753,8 @@ mod tests {
 
     #[test]
     fn test_build_matcher_glob_pattern() {
+        let settings = insta_settings();
+        let _guard = settings.bind_to_scope();
         let glob_expr = |dir: &str, pattern: &str| {
             FilesetExpression::pattern(FilePattern::FileGlob {
                 dir: repo_path_buf(dir),
@@ -810,6 +807,9 @@ mod tests {
 
     #[test]
     fn test_build_matcher_union_patterns_of_same_kind() {
+        let settings = insta_settings();
+        let _guard = settings.bind_to_scope();
+
         let expr = FilesetExpression::union_all(vec![
             FilesetExpression::file_path(repo_path_buf("foo")),
             FilesetExpression::file_path(repo_path_buf("foo/bar")),
@@ -841,6 +841,9 @@ mod tests {
 
     #[test]
     fn test_build_matcher_union_patterns_of_different_kind() {
+        let settings = insta_settings();
+        let _guard = settings.bind_to_scope();
+
         let expr = FilesetExpression::union_all(vec![
             FilesetExpression::file_path(repo_path_buf("foo")),
             FilesetExpression::prefix_path(repo_path_buf("bar")),
@@ -863,6 +866,9 @@ mod tests {
 
     #[test]
     fn test_build_matcher_unnormalized_union() {
+        let settings = insta_settings();
+        let _guard = settings.bind_to_scope();
+
         let expr = FilesetExpression::UnionAll(vec![]);
         insta::assert_debug_snapshot!(expr.to_matcher(), @"NothingMatcher");
 
@@ -878,6 +884,9 @@ mod tests {
 
     #[test]
     fn test_build_matcher_combined() {
+        let settings = insta_settings();
+        let _guard = settings.bind_to_scope();
+
         let expr = FilesetExpression::union_all(vec![
             FilesetExpression::intersection(FilesetExpression::all(), FilesetExpression::none()),
             FilesetExpression::difference(FilesetExpression::none(), FilesetExpression::all()),
diff --git a/lib/src/fsmonitor.rs b/lib/src/fsmonitor.rs
index 21351340ef..c4152159d8 100644
--- a/lib/src/fsmonitor.rs
+++ b/lib/src/fsmonitor.rs
@@ -21,13 +21,23 @@
 #![warn(missing_docs)]
 
 use std::path::PathBuf;
-use std::str::FromStr;
+
+use config::{Config, ConfigError};
+
+use crate::settings::ConfigResultExt;
+
+/// Config for Watchman filesystem monitor (<https://facebook.github.io/watchman/>).
+#[derive(Default, Eq, PartialEq, Clone, Debug)]
+pub struct WatchmanConfig {
+    /// Whether to use triggers to monitor for changes in the background.
+    pub register_trigger: bool,
+}
 
 /// The recognized kinds of filesystem monitors.
 #[derive(Eq, PartialEq, Clone, Debug)]
-pub enum FsmonitorKind {
+pub enum FsmonitorSettings {
     /// The Watchman filesystem monitor (<https://facebook.github.io/watchman/>).
-    Watchman,
+    Watchman(WatchmanConfig),
 
     /// Only used in tests.
     Test {
@@ -44,20 +54,27 @@ pub enum FsmonitorKind {
     None,
 }
 
-impl FromStr for FsmonitorKind {
-    type Err = config::ConfigError;
-
-    fn from_str(s: &str) -> Result<Self, Self::Err> {
-        match s {
-            "watchman" => Ok(Self::Watchman),
-            "test" => Err(config::ConfigError::Message(
-                "cannot use test fsmonitor in real repository".to_string(),
-            )),
-            "none" => Ok(Self::None),
-            other => Err(config::ConfigError::Message(format!(
-                "unknown fsmonitor kind: {}",
-                other
-            ))),
+impl FsmonitorSettings {
+    /// Creates an `FsmonitorSettings` from a `config`.
+    pub fn from_config(config: &Config) -> Result<FsmonitorSettings, ConfigError> {
+        match config.get_string("core.fsmonitor") {
+            Ok(s) => match s.as_str() {
+                "watchman" => Ok(Self::Watchman(WatchmanConfig {
+                    register_trigger: config
+                        .get_bool("core.watchman.register_snapshot_trigger")
+                        .optional()?
+                        .unwrap_or_default(),
+                })),
+                "test" => Err(ConfigError::Message(
+                    "cannot use test fsmonitor in real repository".to_string(),
+                )),
+                "none" => Ok(Self::None),
+                other => Err(ConfigError::Message(format!(
+                    "unknown fsmonitor kind: {other}",
+                ))),
+            },
+            Err(ConfigError::NotFound(_)) => Ok(Self::None),
+            Err(err) => Err(err),
         }
     }
 }
@@ -74,7 +91,7 @@ pub mod watchman {
     use tracing::{info, instrument};
     use watchman_client::expr;
     use watchman_client::prelude::{
-        Clock as InnerClock, ClockSpec, NameOnly, QueryRequestCommon, QueryResult,
+        Clock as InnerClock, ClockSpec, NameOnly, QueryRequestCommon, QueryResult, TriggerRequest,
     };
 
     /// Represents an instance in time from the perspective of the filesystem
@@ -139,6 +156,9 @@ pub mod watchman {
 
         #[error("Failed to query Watchman")]
         WatchmanQueryError(#[source] watchman_client::Error),
+
+        #[error("Failed to register Watchman trigger")]
+        WatchmanTriggerError(#[source] watchman_client::Error),
     }
 
     /// Handle to the underlying Watchman instance.
@@ -153,7 +173,10 @@ pub mod watchman {
         /// copy to build up its in-memory representation of the
         /// filesystem, which may take some time.
         #[instrument]
-        pub async fn init(working_copy_path: &Path) -> Result<Self, Error> {
+        pub async fn init(
+            working_copy_path: &Path,
+            config: &super::WatchmanConfig,
+        ) -> Result<Self, Error> {
             info!("Initializing Watchman filesystem monitor...");
             let connector = watchman_client::Connector::new();
             let client = connector
@@ -166,10 +189,20 @@ pub mod watchman {
                 .resolve_root(working_copy_root)
                 .await
                 .map_err(Error::ResolveRootError)?;
-            Ok(Fsmonitor {
+
+            let monitor = Fsmonitor {
                 client,
                 resolved_root,
-            })
+            };
+
+            // Registering the trigger causes an unconditional evaluation of the query, so
+            // test if it is already registered first.
+            if !config.register_trigger {
+                monitor.unregister_trigger().await?;
+            } else if !monitor.is_trigger_registered().await? {
+                monitor.register_trigger().await?;
+            }
+            Ok(monitor)
         }
 
         /// Query for changed files since the previous point in time.
@@ -184,24 +217,6 @@ pub mod watchman {
         ) -> Result<(Clock, Option<Vec<PathBuf>>), Error> {
             // TODO: might be better to specify query options by caller, but we
             // shouldn't expose the underlying watchman API too much.
-            let exclude_dirs = [Path::new(".git"), Path::new(".jj")];
-            let excludes = itertools::chain(
-                // the directories themselves
-                [expr::Expr::Name(expr::NameTerm {
-                    paths: exclude_dirs.iter().map(|&name| name.to_owned()).collect(),
-                    wholename: true,
-                })],
-                // and all files under the directories
-                exclude_dirs.iter().map(|&name| {
-                    expr::Expr::DirName(expr::DirNameTerm {
-                        path: name.to_owned(),
-                        depth: None,
-                    })
-                }),
-            )
-            .collect();
-            let expression = expr::Expr::Not(Box::new(expr::Expr::Any(excludes)));
-
             info!("Querying Watchman for changed files...");
             let QueryResult {
                 version: _,
@@ -219,7 +234,7 @@ pub mod watchman {
                     &self.resolved_root,
                     QueryRequestCommon {
                         since: previous_clock.map(|Clock(clock)| clock),
-                        expression: Some(expression),
+                        expression: Some(self.build_exclude_expr()),
                         ..Default::default()
                     },
                 )
@@ -242,5 +257,75 @@ pub mod watchman {
                 Ok((clock, Some(paths)))
             }
         }
+
+        /// Return whether or not a trigger has been registered already.
+        #[instrument(skip(self))]
+        pub async fn is_trigger_registered(&self) -> Result<bool, Error> {
+            info!("Checking for an existing Watchman trigger...");
+            Ok(self
+                .client
+                .list_triggers(&self.resolved_root)
+                .await
+                .map_err(Error::WatchmanTriggerError)?
+                .triggers
+                .iter()
+                .any(|t| t.name == "jj-background-monitor"))
+        }
+
+        /// Register trigger for changed files.
+        #[instrument(skip(self))]
+        async fn register_trigger(&self) -> Result<(), Error> {
+            info!("Registering Watchman trigger...");
+            self.client
+                .register_trigger(
+                    &self.resolved_root,
+                    TriggerRequest {
+                        name: "jj-background-monitor".to_string(),
+                        command: vec![
+                            "jj".to_string(),
+                            "debug".to_string(),
+                            "snapshot".to_string(),
+                        ],
+                        expression: Some(self.build_exclude_expr()),
+                        ..Default::default()
+                    },
+                )
+                .await
+                .map_err(Error::WatchmanTriggerError)?;
+            Ok(())
+        }
+
+        /// Register trigger for changed files.
+        #[instrument(skip(self))]
+        async fn unregister_trigger(&self) -> Result<(), Error> {
+            info!("Unregistering Watchman trigger...");
+            self.client
+                .remove_trigger(&self.resolved_root, "jj-background-monitor")
+                .await
+                .map_err(Error::WatchmanTriggerError)?;
+            Ok(())
+        }
+
+        /// Build an exclude expr for `working_copy_path`.
+        fn build_exclude_expr(&self) -> expr::Expr {
+            // TODO: consider parsing `.gitignore`.
+            let exclude_dirs = [Path::new(".git"), Path::new(".jj")];
+            let excludes = itertools::chain(
+                // the directories themselves
+                [expr::Expr::Name(expr::NameTerm {
+                    paths: exclude_dirs.iter().map(|&name| name.to_owned()).collect(),
+                    wholename: true,
+                })],
+                // and all files under the directories
+                exclude_dirs.iter().map(|&name| {
+                    expr::Expr::DirName(expr::DirNameTerm {
+                        path: name.to_owned(),
+                        depth: None,
+                    })
+                }),
+            )
+            .collect();
+            expr::Expr::Not(Box::new(expr::Expr::Any(excludes)))
+        }
     }
 }
diff --git a/lib/src/git.rs b/lib/src/git.rs
index fb3b709166..3086d1c34b 100644
--- a/lib/src/git.rs
+++ b/lib/src/git.rs
@@ -1144,6 +1144,32 @@ pub fn rename_remote(
     Ok(())
 }
 
+pub fn set_remote_url(
+    git_repo: &git2::Repository,
+    remote_name: &str,
+    new_remote_url: &str,
+) -> Result<(), GitRemoteManagementError> {
+    if remote_name == REMOTE_NAME_FOR_LOCAL_GIT_REPO {
+        return Err(GitRemoteManagementError::RemoteReservedForLocalGitRepo);
+    }
+
+    // Repository::remote_set_url() doesn't ensure the remote exists, it just
+    // creates it if it's missing.
+    // Therefore ensure it exists first
+    git_repo.find_remote(remote_name).map_err(|err| {
+        if is_remote_not_found_err(&err) {
+            GitRemoteManagementError::NoSuchRemote(remote_name.to_owned())
+        } else {
+            GitRemoteManagementError::InternalGitError(err)
+        }
+    })?;
+
+    git_repo
+        .remote_set_url(remote_name, new_remote_url)
+        .map_err(GitRemoteManagementError::InternalGitError)?;
+    Ok(())
+}
+
 fn rename_remote_refs(mut_repo: &mut MutableRepo, old_remote_name: &str, new_remote_name: &str) {
     mut_repo.rename_remote(old_remote_name, new_remote_name);
     let prefix = format!("refs/remotes/{old_remote_name}/");
diff --git a/lib/src/local_working_copy.rs b/lib/src/local_working_copy.rs
index d45338f20d..55a7ed6771 100644
--- a/lib/src/local_working_copy.rs
+++ b/lib/src/local_working_copy.rs
@@ -49,7 +49,7 @@ use crate::conflicts::{self, materialize_tree_value, MaterializedTreeValue};
 use crate::file_util::{check_symlink_support, try_symlink};
 #[cfg(feature = "watchman")]
 use crate::fsmonitor::watchman;
-use crate::fsmonitor::FsmonitorKind;
+use crate::fsmonitor::{FsmonitorSettings, WatchmanConfig};
 use crate::gitignore::GitIgnoreFile;
 use crate::lock::FileLock;
 use crate::matchers::{
@@ -726,8 +726,9 @@ impl TreeState {
     #[instrument(skip(self))]
     pub async fn query_watchman(
         &self,
+        config: &WatchmanConfig,
     ) -> Result<(watchman::Clock, Option<Vec<PathBuf>>), TreeStateError> {
-        let fsmonitor = watchman::Fsmonitor::init(&self.working_copy_path)
+        let fsmonitor = watchman::Fsmonitor::init(&self.working_copy_path, config)
             .await
             .map_err(|err| TreeStateError::Fsmonitor(Box::new(err)))?;
         let previous_clock = self.watchman_clock.clone().map(watchman::Clock::from);
@@ -738,25 +739,41 @@ impl TreeState {
         Ok(changed_files)
     }
 
+    #[cfg(feature = "watchman")]
+    #[tokio::main(flavor = "current_thread")]
+    #[instrument(skip(self))]
+    pub async fn is_watchman_trigger_registered(
+        &self,
+        config: &WatchmanConfig,
+    ) -> Result<bool, TreeStateError> {
+        let fsmonitor = watchman::Fsmonitor::init(&self.working_copy_path, config)
+            .await
+            .map_err(|err| TreeStateError::Fsmonitor(Box::new(err)))?;
+        fsmonitor
+            .is_trigger_registered()
+            .await
+            .map_err(|err| TreeStateError::Fsmonitor(Box::new(err)))
+    }
+
     /// Look for changes to the working copy. If there are any changes, create
     /// a new tree from it and return it, and also update the dirstate on disk.
     #[instrument(skip_all)]
     pub fn snapshot(&mut self, options: SnapshotOptions) -> Result<bool, SnapshotError> {
         let SnapshotOptions {
             base_ignores,
-            fsmonitor_kind,
+            fsmonitor_settings,
             progress,
             max_new_file_size,
         } = options;
 
         let sparse_matcher = self.sparse_matcher();
 
-        let fsmonitor_clock_needs_save = fsmonitor_kind != FsmonitorKind::None;
+        let fsmonitor_clock_needs_save = fsmonitor_settings != FsmonitorSettings::None;
         let mut is_dirty = fsmonitor_clock_needs_save;
         let FsmonitorMatcher {
             matcher: fsmonitor_matcher,
             watchman_clock,
-        } = self.make_fsmonitor_matcher(fsmonitor_kind)?;
+        } = self.make_fsmonitor_matcher(fsmonitor_settings)?;
         let fsmonitor_matcher = match fsmonitor_matcher.as_ref() {
             None => &EverythingMatcher,
             Some(fsmonitor_matcher) => fsmonitor_matcher.as_ref(),
@@ -1024,13 +1041,13 @@ impl TreeState {
     #[instrument(skip_all)]
     fn make_fsmonitor_matcher(
         &self,
-        fsmonitor_kind: FsmonitorKind,
+        fsmonitor_settings: FsmonitorSettings,
     ) -> Result<FsmonitorMatcher, SnapshotError> {
-        let (watchman_clock, changed_files) = match fsmonitor_kind {
-            FsmonitorKind::None => (None, None),
-            FsmonitorKind::Test { changed_files } => (None, Some(changed_files)),
+        let (watchman_clock, changed_files) = match fsmonitor_settings {
+            FsmonitorSettings::None => (None, None),
+            FsmonitorSettings::Test { changed_files } => (None, Some(changed_files)),
             #[cfg(feature = "watchman")]
-            FsmonitorKind::Watchman => match self.query_watchman() {
+            FsmonitorSettings::Watchman(config) => match self.query_watchman(&config) {
                 Ok((watchman_clock, changed_files)) => (Some(watchman_clock.into()), changed_files),
                 Err(err) => {
                     tracing::warn!(?err, "Failed to query filesystem monitor");
@@ -1038,7 +1055,7 @@ impl TreeState {
                 }
             },
             #[cfg(not(feature = "watchman"))]
-            FsmonitorKind::Watchman => {
+            FsmonitorSettings::Watchman(_) => {
                 return Err(SnapshotError::Other {
                     message: "Failed to query the filesystem monitor".to_string(),
                     err: "Cannot query Watchman because jj was not compiled with the `watchman` \
@@ -1686,9 +1703,23 @@ impl LocalWorkingCopy {
     #[cfg(feature = "watchman")]
     pub fn query_watchman(
         &self,
+        config: &WatchmanConfig,
     ) -> Result<(watchman::Clock, Option<Vec<PathBuf>>), WorkingCopyStateError> {
         self.tree_state()?
-            .query_watchman()
+            .query_watchman(config)
+            .map_err(|err| WorkingCopyStateError {
+                message: "Failed to query watchman".to_string(),
+                err: err.into(),
+            })
+    }
+
+    #[cfg(feature = "watchman")]
+    pub fn is_watchman_trigger_registered(
+        &self,
+        config: &WatchmanConfig,
+    ) -> Result<bool, WorkingCopyStateError> {
+        self.tree_state()?
+            .is_watchman_trigger_registered(config)
             .map_err(|err| WorkingCopyStateError {
                 message: "Failed to query watchman".to_string(),
                 err: err.into(),
diff --git a/lib/src/merge.rs b/lib/src/merge.rs
index 5ac6a765bf..e16786ee36 100644
--- a/lib/src/merge.rs
+++ b/lib/src/merge.rs
@@ -249,25 +249,66 @@ impl<T> Merge<T> {
         }
     }
 
-    /// Simplify the merge by joining diffs like A->B and B->C into A->C.
-    /// Also drops trivial diffs like A->A.
-    pub fn simplify(mut self) -> Self
+    /// Returns a vector mapping of a value's index in the simplified merge to
+    /// its original index in the unsimplified merge.
+    ///
+    /// The merge is simplified by removing identical values in add and remove
+    /// values.
+    fn get_simplified_mapping(&self) -> Vec<usize>
     where
         T: PartialEq,
     {
+        let unsimplified_len = self.values.len();
+        let mut simplified_to_original_indices = (0..unsimplified_len).collect_vec();
+
         let mut add_index = 0;
-        while add_index < self.values.len() {
-            let add = &self.values[add_index];
-            let mut removes = self.values.iter().enumerate().skip(1).step_by(2);
-            if let Some((remove_index, _)) = removes.find(|&(_, remove)| remove == add) {
+        while add_index < simplified_to_original_indices.len() {
+            let add = &self.values[simplified_to_original_indices[add_index]];
+            let mut remove_indices = simplified_to_original_indices
+                .iter()
+                .enumerate()
+                .skip(1)
+                .step_by(2);
+            if let Some((remove_index, _)) = remove_indices
+                .find(|&(_, original_remove_index)| &self.values[*original_remove_index] == add)
+            {
                 // Align the current "add" value to the `remove_index/2`-th diff, then
                 // delete the diff pair.
-                self.values.swap(remove_index + 1, add_index);
-                self.values.drain(remove_index..remove_index + 2);
+                simplified_to_original_indices.swap(remove_index + 1, add_index);
+                simplified_to_original_indices.drain(remove_index..remove_index + 2);
             } else {
                 add_index += 2;
             }
         }
+
+        simplified_to_original_indices
+    }
+
+    /// Simplify the merge by joining diffs like A->B and B->C into A->C.
+    /// Also drops trivial diffs like A->A.
+    pub fn simplify(mut self) -> Self
+    where
+        T: PartialEq + Clone,
+    {
+        let mapping = self.get_simplified_mapping();
+        // Reorder values based on their new indices in the simplified merge.
+        self.values = mapping
+            .iter()
+            .map(|index| self.values[*index].clone())
+            .collect();
+        self
+    }
+
+    /// Updates the merge based on the given simplified merge.
+    pub fn update_from_simplified(mut self, simplified: Merge<T>) -> Self
+    where
+        T: PartialEq,
+    {
+        let mapping = self.get_simplified_mapping();
+        assert_eq!(mapping.len(), simplified.values.len());
+        for (index, value) in mapping.into_iter().zip(simplified.values.into_iter()) {
+            self.values[index] = value;
+        }
         self
     }
 
@@ -747,6 +788,183 @@ mod tests {
         );
     }
 
+    #[test]
+    fn test_get_simplified_mapping() {
+        // 1-way merge
+        assert_eq!(c(&[], &[0]).get_simplified_mapping(), vec![0]);
+        // 3-way merge
+        assert_eq!(c(&[0], &[0, 0]).get_simplified_mapping(), vec![2]);
+        assert_eq!(c(&[0], &[0, 1]).get_simplified_mapping(), vec![2]);
+        assert_eq!(c(&[0], &[1, 0]).get_simplified_mapping(), vec![0]);
+        assert_eq!(c(&[0], &[1, 1]).get_simplified_mapping(), vec![0, 1, 2]);
+        assert_eq!(c(&[0], &[1, 2]).get_simplified_mapping(), vec![0, 1, 2]);
+        // 5-way merge
+        assert_eq!(c(&[0, 0], &[0, 0, 0]).get_simplified_mapping(), vec![4]);
+        assert_eq!(c(&[0, 0], &[0, 0, 1]).get_simplified_mapping(), vec![4]);
+        assert_eq!(c(&[0, 0], &[0, 1, 0]).get_simplified_mapping(), vec![2]);
+        assert_eq!(
+            c(&[0, 0], &[0, 1, 1]).get_simplified_mapping(),
+            vec![2, 3, 4]
+        );
+        assert_eq!(
+            c(&[0, 0], &[0, 1, 2]).get_simplified_mapping(),
+            vec![2, 3, 4]
+        );
+        assert_eq!(c(&[0, 0], &[1, 0, 0]).get_simplified_mapping(), vec![0]);
+        assert_eq!(
+            c(&[0, 0], &[1, 0, 1]).get_simplified_mapping(),
+            vec![0, 3, 4]
+        );
+        assert_eq!(
+            c(&[0, 0], &[1, 0, 2]).get_simplified_mapping(),
+            vec![0, 3, 4]
+        );
+        assert_eq!(
+            c(&[0, 0], &[1, 1, 0]).get_simplified_mapping(),
+            vec![0, 3, 2]
+        );
+        assert_eq!(
+            c(&[0, 0], &[1, 1, 1]).get_simplified_mapping(),
+            vec![0, 1, 2, 3, 4]
+        );
+        assert_eq!(
+            c(&[0, 0], &[1, 1, 2]).get_simplified_mapping(),
+            vec![0, 1, 2, 3, 4]
+        );
+        assert_eq!(
+            c(&[0, 0], &[1, 2, 0]).get_simplified_mapping(),
+            vec![0, 3, 2]
+        );
+        assert_eq!(
+            c(&[0, 0], &[1, 2, 1]).get_simplified_mapping(),
+            vec![0, 1, 2, 3, 4]
+        );
+        assert_eq!(
+            c(&[0, 0], &[1, 2, 2]).get_simplified_mapping(),
+            vec![0, 1, 2, 3, 4]
+        );
+        assert_eq!(
+            c(&[0, 0], &[1, 2, 3]).get_simplified_mapping(),
+            vec![0, 1, 2, 3, 4]
+        );
+        assert_eq!(
+            c(&[0, 1], &[0, 0, 0]).get_simplified_mapping(),
+            vec![2, 3, 4]
+        );
+        assert_eq!(c(&[0, 1], &[0, 0, 1]).get_simplified_mapping(), vec![2]);
+        assert_eq!(
+            c(&[0, 1], &[0, 0, 2]).get_simplified_mapping(),
+            vec![2, 3, 4]
+        );
+        assert_eq!(c(&[0, 1], &[0, 1, 0]).get_simplified_mapping(), vec![4]);
+        assert_eq!(c(&[0, 1], &[0, 1, 1]).get_simplified_mapping(), vec![4]);
+        assert_eq!(c(&[0, 1], &[0, 1, 2]).get_simplified_mapping(), vec![4]);
+        assert_eq!(
+            c(&[0, 1], &[0, 2, 0]).get_simplified_mapping(),
+            vec![2, 3, 4]
+        );
+        assert_eq!(c(&[0, 1], &[0, 2, 1]).get_simplified_mapping(), vec![2]);
+        assert_eq!(
+            c(&[0, 1], &[0, 2, 2]).get_simplified_mapping(),
+            vec![2, 3, 4]
+        );
+        assert_eq!(
+            c(&[0, 1], &[0, 2, 3]).get_simplified_mapping(),
+            vec![2, 3, 4]
+        );
+        assert_eq!(c(&[0, 1], &[1, 0, 0]).get_simplified_mapping(), vec![2]);
+        assert_eq!(c(&[0, 1], &[1, 0, 1]).get_simplified_mapping(), vec![4]);
+        assert_eq!(c(&[0, 1], &[1, 0, 2]).get_simplified_mapping(), vec![4]);
+        assert_eq!(c(&[0, 1], &[1, 1, 0]).get_simplified_mapping(), vec![2]);
+        assert_eq!(
+            c(&[0, 1], &[1, 1, 1]).get_simplified_mapping(),
+            vec![4, 1, 2]
+        );
+        assert_eq!(
+            c(&[0, 1], &[1, 1, 2]).get_simplified_mapping(),
+            vec![4, 1, 2]
+        );
+        assert_eq!(c(&[0, 1], &[1, 2, 0]).get_simplified_mapping(), vec![2]);
+        assert_eq!(
+            c(&[0, 1], &[1, 2, 1]).get_simplified_mapping(),
+            vec![4, 1, 2]
+        );
+        assert_eq!(
+            c(&[0, 1], &[1, 2, 2]).get_simplified_mapping(),
+            vec![4, 1, 2]
+        );
+        assert_eq!(
+            c(&[0, 1], &[1, 2, 3]).get_simplified_mapping(),
+            vec![4, 1, 2]
+        );
+        assert_eq!(
+            c(&[0, 1], &[2, 0, 0]).get_simplified_mapping(),
+            vec![0, 3, 4]
+        );
+        assert_eq!(c(&[0, 1], &[2, 0, 1]).get_simplified_mapping(), vec![0]);
+        assert_eq!(
+            c(&[0, 1], &[2, 0, 2]).get_simplified_mapping(),
+            vec![0, 3, 4]
+        );
+        assert_eq!(
+            c(&[0, 1], &[2, 0, 3]).get_simplified_mapping(),
+            vec![0, 3, 4]
+        );
+        assert_eq!(c(&[0, 1], &[2, 1, 0]).get_simplified_mapping(), vec![0]);
+        assert_eq!(
+            c(&[0, 1], &[2, 1, 1]).get_simplified_mapping(),
+            vec![0, 1, 4]
+        );
+        assert_eq!(
+            c(&[0, 1], &[2, 1, 2]).get_simplified_mapping(),
+            vec![0, 1, 4]
+        );
+        assert_eq!(
+            c(&[0, 1], &[2, 1, 3]).get_simplified_mapping(),
+            vec![0, 1, 4]
+        );
+        assert_eq!(
+            c(&[0, 1], &[2, 2, 0]).get_simplified_mapping(),
+            vec![0, 3, 2]
+        );
+        assert_eq!(
+            c(&[0, 1], &[2, 2, 1]).get_simplified_mapping(),
+            vec![0, 1, 2]
+        );
+        assert_eq!(
+            c(&[0, 1], &[2, 2, 2]).get_simplified_mapping(),
+            vec![0, 1, 2, 3, 4]
+        );
+        assert_eq!(
+            c(&[0, 1], &[2, 2, 3]).get_simplified_mapping(),
+            vec![0, 1, 2, 3, 4]
+        );
+        assert_eq!(
+            c(&[0, 1], &[2, 3, 0]).get_simplified_mapping(),
+            vec![0, 3, 2]
+        );
+        assert_eq!(
+            c(&[0, 1], &[2, 3, 1]).get_simplified_mapping(),
+            vec![0, 1, 2]
+        );
+        assert_eq!(
+            c(&[0, 1], &[2, 3, 2]).get_simplified_mapping(),
+            vec![0, 1, 2, 3, 4]
+        );
+        assert_eq!(
+            c(&[0, 1], &[2, 3, 3]).get_simplified_mapping(),
+            vec![0, 1, 2, 3, 4]
+        );
+        assert_eq!(
+            c(&[0, 1], &[2, 3, 4]).get_simplified_mapping(),
+            vec![0, 1, 2, 3, 4]
+        );
+        assert_eq!(
+            c(&[0, 1, 2], &[3, 4, 5, 0]).get_simplified_mapping(),
+            vec![0, 3, 4, 5, 2]
+        );
+    }
+
     #[test]
     fn test_simplify() {
         // 1-way merge
@@ -816,6 +1034,56 @@ mod tests {
         );
     }
 
+    #[test]
+    fn test_update_from_simplified() {
+        // 1-way merge
+        assert_eq!(
+            c(&[], &[0]).update_from_simplified(c(&[], &[1])),
+            c(&[], &[1])
+        );
+        // 3-way merge
+        assert_eq!(
+            c(&[0], &[0, 0]).update_from_simplified(c(&[], &[1])),
+            c(&[0], &[0, 1])
+        );
+        assert_eq!(
+            c(&[0], &[1, 0]).update_from_simplified(c(&[], &[2])),
+            c(&[0], &[2, 0])
+        );
+        assert_eq!(
+            c(&[0], &[1, 2]).update_from_simplified(c(&[1], &[2, 3])),
+            c(&[1], &[2, 3])
+        );
+        // 5-way merge
+        assert_eq!(
+            c(&[0, 0], &[0, 0, 0]).update_from_simplified(c(&[], &[1])),
+            c(&[0, 0], &[0, 0, 1])
+        );
+        assert_eq!(
+            c(&[0, 1], &[0, 0, 0]).update_from_simplified(c(&[3], &[2, 1])),
+            c(&[0, 3], &[0, 2, 1])
+        );
+        assert_eq!(
+            c(&[1, 0], &[0, 0, 0]).update_from_simplified(c(&[3], &[2, 1])),
+            c(&[3, 0], &[0, 1, 2])
+        );
+        assert_eq!(
+            c(&[0, 1], &[2, 3, 4]).update_from_simplified(c(&[1, 2], &[3, 4, 5])),
+            c(&[1, 2], &[3, 4, 5])
+        );
+
+        assert_eq!(
+            c(&[0, 1, 2], &[0, 3, 3, 4]).simplify(),
+            c(&[1, 2], &[3, 3, 4])
+        );
+        // Check that the `3`s are replaced correctly and that `4` ends up in the
+        // correct position.
+        assert_eq!(
+            c(&[0, 1, 2], &[0, 3, 3, 4]).update_from_simplified(c(&[1, 2], &[10, 11, 4])),
+            c(&[0, 1, 2], &[0, 10, 11, 4])
+        );
+    }
+
     #[test]
     fn test_merge_invariants() {
         fn check_invariants(removes: &[u32], adds: &[u32]) {
diff --git a/lib/src/merged_tree.rs b/lib/src/merged_tree.rs
index 2ddb55ce9a..a0986e4f61 100644
--- a/lib/src/merged_tree.rs
+++ b/lib/src/merged_tree.rs
@@ -22,8 +22,9 @@ use std::sync::Arc;
 use std::task::{Context, Poll};
 use std::{iter, vec};
 
-use futures::stream::StreamExt;
-use futures::{Future, Stream, TryStreamExt};
+use futures::future::BoxFuture;
+use futures::stream::{BoxStream, StreamExt};
+use futures::{Stream, TryStreamExt};
 use itertools::Itertools;
 
 use crate::backend;
@@ -407,15 +408,12 @@ impl MergedTree {
 /// Type alias for the result from `MergedTree::diff_stream()`. We use a
 /// `Stream` instead of an `Iterator` so high-latency backends (e.g. cloud-based
 /// ones) can fetch trees asynchronously.
-pub type TreeDiffStream<'matcher> = Pin<
-    Box<
-        dyn Stream<
-                Item = (
-                    RepoPathBuf,
-                    BackendResult<(MergedTreeValue, MergedTreeValue)>,
-                ),
-            > + 'matcher,
-    >,
+pub type TreeDiffStream<'matcher> = BoxStream<
+    'matcher,
+    (
+        RepoPathBuf,
+        BackendResult<(MergedTreeValue, MergedTreeValue)>,
+    ),
 >;
 
 fn all_tree_basenames(trees: &Merge<Tree>) -> impl Iterator<Item = &RepoPathComponent> {
@@ -902,7 +900,7 @@ pub struct TreeDiffStreamImpl<'matcher> {
     #[allow(clippy::type_complexity)]
     pending_trees: VecDeque<(
         RepoPathBuf,
-        Pin<Box<dyn Future<Output = BackendResult<(MergedTree, MergedTree)>> + 'matcher>>,
+        BoxFuture<'matcher, BackendResult<(MergedTree, MergedTree)>>,
     )>,
     /// The maximum number of trees to request concurrently. However, we do the
     /// accounting per path, so for there will often be twice as many pending
diff --git a/lib/src/repo.rs b/lib/src/repo.rs
index 1382dc9224..e90158284d 100644
--- a/lib/src/repo.rs
+++ b/lib/src/repo.rs
@@ -1428,16 +1428,6 @@ impl MutableRepo {
         self.view.mark_dirty();
     }
 
-    /// Returns true if any local or remote branch of the given `name` exists.
-    #[must_use]
-    pub fn has_branch(&self, name: &str) -> bool {
-        self.view.with_ref(|v| v.has_branch(name))
-    }
-
-    pub fn remove_branch(&mut self, name: &str) {
-        self.view_mut().remove_branch(name);
-    }
-
     pub fn get_local_branch(&self, name: &str) -> RefTarget {
         self.view.with_ref(|v| v.get_local_branch(name).clone())
     }
diff --git a/lib/src/revset.rs b/lib/src/revset.rs
index 263074e726..079a883e24 100644
--- a/lib/src/revset.rs
+++ b/lib/src/revset.rs
@@ -53,7 +53,7 @@ pub enum RevsetResolutionError {
         name: String,
         candidates: Vec<String>,
     },
-    #[error("Workspace \"{name}\" doesn't have a working copy")]
+    #[error("Workspace \"{name}\" doesn't have a working-copy commit")]
     WorkspaceMissingWorkingCopy { name: String },
     #[error("An empty string is not a valid revision")]
     EmptyString,
@@ -92,7 +92,7 @@ pub enum RevsetModifier {
 }
 
 /// Symbol or function to be resolved to `CommitId`s.
-#[derive(Clone, Debug, Eq, PartialEq)]
+#[derive(Clone, Debug)]
 pub enum RevsetCommitRef {
     WorkingCopy(WorkspaceId),
     WorkingCopies,
@@ -121,20 +121,7 @@ pub trait RevsetFilterExtension: std::fmt::Debug + Any {
     fn matches_commit(&self, commit: &Commit) -> bool;
 }
 
-// TODO: Refactor tests to not need the Eq trait so we can remove this wrapper.
 #[derive(Clone, Debug)]
-#[repr(transparent)]
-pub struct RevsetFilterExtensionWrapper(pub Rc<dyn RevsetFilterExtension>);
-
-impl PartialEq for RevsetFilterExtensionWrapper {
-    fn eq(&self, other: &RevsetFilterExtensionWrapper) -> bool {
-        Rc::ptr_eq(&self.0, &other.0)
-    }
-}
-
-impl Eq for RevsetFilterExtensionWrapper {}
-
-#[derive(Clone, Debug, Eq, PartialEq)]
 pub enum RevsetFilterPredicate {
     /// Commits with number of parents in the range.
     ParentCount(Range<u32>),
@@ -149,10 +136,10 @@ pub enum RevsetFilterPredicate {
     /// Commits with conflicts
     HasConflict,
     /// Custom predicates provided by extensions
-    Extension(RevsetFilterExtensionWrapper),
+    Extension(Rc<dyn RevsetFilterExtension>),
 }
 
-#[derive(Debug, PartialEq, Eq, Clone)]
+#[derive(Clone, Debug)]
 pub enum RevsetExpression {
     None,
     All,
@@ -301,10 +288,7 @@ impl RevsetExpression {
 
     /// Parents of `self`.
     pub fn parents(self: &Rc<RevsetExpression>) -> Rc<RevsetExpression> {
-        Rc::new(RevsetExpression::Ancestors {
-            heads: self.clone(),
-            generation: 1..2,
-        })
+        self.ancestors_at(1)
     }
 
     /// Ancestors of `self`, including `self`.
@@ -331,10 +315,7 @@ impl RevsetExpression {
 
     /// Children of `self`.
     pub fn children(self: &Rc<RevsetExpression>) -> Rc<RevsetExpression> {
-        Rc::new(RevsetExpression::Descendants {
-            roots: self.clone(),
-            generation: 1..2,
-        })
+        self.descendants_at(1)
     }
 
     /// Descendants of `self`, including `self`.
@@ -359,6 +340,13 @@ impl RevsetExpression {
         })
     }
 
+    /// Filter all commits by `predicate` in `self`.
+    pub fn filtered(
+        self: &Rc<RevsetExpression>,
+        predicate: RevsetFilterPredicate,
+    ) -> Rc<RevsetExpression> {
+        self.intersection(&RevsetExpression::filter(predicate))
+    }
     /// Commits that are descendants of `self` and ancestors of `heads`, both
     /// inclusive.
     pub fn dag_range_to(
@@ -478,7 +466,7 @@ impl RevsetExpression {
     }
 }
 
-#[derive(Clone, Debug, Eq, PartialEq)]
+#[derive(Clone, Debug)]
 pub enum ResolvedPredicateExpression {
     /// Pure filter predicate.
     Filter(RevsetFilterPredicate),
@@ -498,7 +486,7 @@ pub enum ResolvedPredicateExpression {
 /// properties.
 ///
 /// Use `RevsetExpression` API to build a query programmatically.
-#[derive(Clone, Debug, Eq, PartialEq)]
+#[derive(Clone, Debug)]
 pub enum ResolvedExpression {
     Commits(Vec<CommitId>),
     Ancestors {
@@ -2035,7 +2023,6 @@ mod tests {
     use assert_matches::assert_matches;
 
     use super::*;
-    use crate::repo_path::RepoPathBuf;
 
     fn parse(revset_str: &str) -> Result<Rc<RevsetExpression>, RevsetParseErrorKind> {
         parse_with_aliases(revset_str, [] as [(&str, &str); 0])
@@ -2121,283 +2108,356 @@ mod tests {
         super::parse_with_modifier(revset_str, &context).map_err(|e| e.kind)
     }
 
+    fn insta_settings() -> insta::Settings {
+        let mut settings = insta::Settings::clone_current();
+        // Collapse short "Thing(_,)" repeatedly to save vertical space and make
+        // the output more readable.
+        for _ in 0..4 {
+            settings.add_filter(
+                r"(?x)
+                \b([A-Z]\w*)\(\n
+                    \s*(.{1,60}),\n
+                \s*\)",
+                "$1($2)",
+            );
+        }
+        settings
+    }
+
     #[test]
     #[allow(clippy::redundant_clone)] // allow symbol.clone()
     fn test_revset_expression_building() {
+        let settings = insta_settings();
+        let _guard = settings.bind_to_scope();
         let current_wc = RevsetExpression::working_copy(WorkspaceId::default());
         let foo_symbol = RevsetExpression::symbol("foo".to_string());
         let bar_symbol = RevsetExpression::symbol("bar".to_string());
         let baz_symbol = RevsetExpression::symbol("baz".to_string());
-        assert_eq!(
+
+        insta::assert_debug_snapshot!(
             current_wc,
-            Rc::new(RevsetExpression::CommitRef(RevsetCommitRef::WorkingCopy(
-                WorkspaceId::default()
-            ))),
-        );
-        assert_eq!(
+            @r###"CommitRef(WorkingCopy(WorkspaceId("default")))"###);
+        insta::assert_debug_snapshot!(
             current_wc.heads(),
-            Rc::new(RevsetExpression::Heads(current_wc.clone()))
-        );
-        assert_eq!(
+            @r###"Heads(CommitRef(WorkingCopy(WorkspaceId("default"))))"###);
+        insta::assert_debug_snapshot!(
             current_wc.roots(),
-            Rc::new(RevsetExpression::Roots(current_wc.clone()))
-        );
-        assert_eq!(
-            current_wc.parents(),
-            Rc::new(RevsetExpression::Ancestors {
-                heads: current_wc.clone(),
-                generation: 1..2,
-            })
-        );
-        assert_eq!(
-            current_wc.ancestors(),
-            Rc::new(RevsetExpression::Ancestors {
-                heads: current_wc.clone(),
-                generation: GENERATION_RANGE_FULL,
-            })
-        );
-        assert_eq!(
-            foo_symbol.children(),
-            Rc::new(RevsetExpression::Descendants {
-                roots: foo_symbol.clone(),
-                generation: 1..2,
-            }),
-        );
-        assert_eq!(
-            foo_symbol.descendants(),
-            Rc::new(RevsetExpression::Descendants {
-                roots: foo_symbol.clone(),
-                generation: GENERATION_RANGE_FULL,
-            })
-        );
-        assert_eq!(
-            foo_symbol.dag_range_to(&current_wc),
-            Rc::new(RevsetExpression::DagRange {
-                roots: foo_symbol.clone(),
-                heads: current_wc.clone(),
-            })
-        );
-        assert_eq!(
-            foo_symbol.connected(),
-            Rc::new(RevsetExpression::DagRange {
-                roots: foo_symbol.clone(),
-                heads: foo_symbol.clone(),
-            })
-        );
-        assert_eq!(
-            foo_symbol.range(&current_wc),
-            Rc::new(RevsetExpression::Range {
-                roots: foo_symbol.clone(),
-                heads: current_wc.clone(),
-                generation: GENERATION_RANGE_FULL,
-            })
-        );
-        assert_eq!(
+            @r###"Roots(CommitRef(WorkingCopy(WorkspaceId("default"))))"###);
+        insta::assert_debug_snapshot!(
+            current_wc.parents(), @r###"
+        Ancestors {
+            heads: CommitRef(WorkingCopy(WorkspaceId("default"))),
+            generation: 1..2,
+        }
+        "###);
+        insta::assert_debug_snapshot!(
+            current_wc.ancestors(), @r###"
+        Ancestors {
+            heads: CommitRef(WorkingCopy(WorkspaceId("default"))),
+            generation: 0..18446744073709551615,
+        }
+        "###);
+        insta::assert_debug_snapshot!(
+            foo_symbol.children(), @r###"
+        Descendants {
+            roots: CommitRef(Symbol("foo")),
+            generation: 1..2,
+        }
+        "###);
+        insta::assert_debug_snapshot!(
+            foo_symbol.descendants(), @r###"
+        Descendants {
+            roots: CommitRef(Symbol("foo")),
+            generation: 0..18446744073709551615,
+        }
+        "###);
+        insta::assert_debug_snapshot!(
+            foo_symbol.dag_range_to(&current_wc), @r###"
+        DagRange {
+            roots: CommitRef(Symbol("foo")),
+            heads: CommitRef(WorkingCopy(WorkspaceId("default"))),
+        }
+        "###);
+        insta::assert_debug_snapshot!(
+            foo_symbol.connected(), @r###"
+        DagRange {
+            roots: CommitRef(Symbol("foo")),
+            heads: CommitRef(Symbol("foo")),
+        }
+        "###);
+        insta::assert_debug_snapshot!(
+            foo_symbol.range(&current_wc), @r###"
+        Range {
+            roots: CommitRef(Symbol("foo")),
+            heads: CommitRef(WorkingCopy(WorkspaceId("default"))),
+            generation: 0..18446744073709551615,
+        }
+        "###);
+        insta::assert_debug_snapshot!(
             foo_symbol.negated(),
-            Rc::new(RevsetExpression::NotIn(foo_symbol.clone()))
-        );
-        assert_eq!(
-            foo_symbol.union(&current_wc),
-            Rc::new(RevsetExpression::Union(
-                foo_symbol.clone(),
-                current_wc.clone()
-            ))
-        );
-        assert_eq!(
+            @r###"NotIn(CommitRef(Symbol("foo")))"###);
+        insta::assert_debug_snapshot!(
+            foo_symbol.union(&current_wc), @r###"
+        Union(
+            CommitRef(Symbol("foo")),
+            CommitRef(WorkingCopy(WorkspaceId("default"))),
+        )
+        "###);
+        insta::assert_debug_snapshot!(
             RevsetExpression::union_all(&[]),
-            Rc::new(RevsetExpression::None)
-        );
-        assert_eq!(
+            @"None");
+        insta::assert_debug_snapshot!(
             RevsetExpression::union_all(&[current_wc.clone()]),
-            current_wc
-        );
-        assert_eq!(
+            @r###"CommitRef(WorkingCopy(WorkspaceId("default")))"###);
+        insta::assert_debug_snapshot!(
             RevsetExpression::union_all(&[current_wc.clone(), foo_symbol.clone()]),
-            Rc::new(RevsetExpression::Union(
-                current_wc.clone(),
-                foo_symbol.clone(),
-            ))
-        );
-        assert_eq!(
+            @r###"
+        Union(
+            CommitRef(WorkingCopy(WorkspaceId("default"))),
+            CommitRef(Symbol("foo")),
+        )
+        "###);
+        insta::assert_debug_snapshot!(
             RevsetExpression::union_all(&[
                 current_wc.clone(),
                 foo_symbol.clone(),
                 bar_symbol.clone(),
             ]),
-            Rc::new(RevsetExpression::Union(
-                current_wc.clone(),
-                Rc::new(RevsetExpression::Union(
-                    foo_symbol.clone(),
-                    bar_symbol.clone(),
-                ))
-            ))
-        );
-        assert_eq!(
+            @r###"
+        Union(
+            CommitRef(WorkingCopy(WorkspaceId("default"))),
+            Union(
+                CommitRef(Symbol("foo")),
+                CommitRef(Symbol("bar")),
+            ),
+        )
+        "###);
+        insta::assert_debug_snapshot!(
             RevsetExpression::union_all(&[
                 current_wc.clone(),
                 foo_symbol.clone(),
                 bar_symbol.clone(),
                 baz_symbol.clone(),
             ]),
-            Rc::new(RevsetExpression::Union(
-                Rc::new(RevsetExpression::Union(
-                    current_wc.clone(),
-                    foo_symbol.clone(),
-                )),
-                Rc::new(RevsetExpression::Union(
-                    bar_symbol.clone(),
-                    baz_symbol.clone(),
-                ))
-            ))
-        );
-        assert_eq!(
-            foo_symbol.intersection(&current_wc),
-            Rc::new(RevsetExpression::Intersection(
-                foo_symbol.clone(),
-                current_wc.clone()
-            ))
-        );
-        assert_eq!(
-            foo_symbol.minus(&current_wc),
-            Rc::new(RevsetExpression::Difference(foo_symbol, current_wc.clone()))
-        );
+            @r###"
+        Union(
+            Union(
+                CommitRef(WorkingCopy(WorkspaceId("default"))),
+                CommitRef(Symbol("foo")),
+            ),
+            Union(
+                CommitRef(Symbol("bar")),
+                CommitRef(Symbol("baz")),
+            ),
+        )
+        "###);
+        insta::assert_debug_snapshot!(
+            foo_symbol.intersection(&current_wc), @r###"
+        Intersection(
+            CommitRef(Symbol("foo")),
+            CommitRef(WorkingCopy(WorkspaceId("default"))),
+        )
+        "###);
+        insta::assert_debug_snapshot!(
+            foo_symbol.minus(&current_wc), @r###"
+        Difference(
+            CommitRef(Symbol("foo")),
+            CommitRef(WorkingCopy(WorkspaceId("default"))),
+        )
+        "###);
     }
 
     #[test]
     fn test_parse_revset() {
+        let settings = insta_settings();
+        let _guard = settings.bind_to_scope();
         let main_workspace_id = WorkspaceId::new("main".to_string());
         let other_workspace_id = WorkspaceId::new("other".to_string());
-        let main_wc = RevsetExpression::working_copy(main_workspace_id.clone());
-        let foo_symbol = RevsetExpression::symbol("foo".to_string());
-        let bar_symbol = RevsetExpression::symbol("bar".to_string());
+
         // Parse "@" (the current working copy)
-        assert_eq!(
-            parse("@"),
-            Err(RevsetParseErrorKind::WorkingCopyWithoutWorkspace)
-        );
-        assert_eq!(parse("main@"), Ok(main_wc.clone()));
-        assert_eq!(
-            parse_with_workspace("@", &main_workspace_id),
-            Ok(main_wc.clone())
-        );
-        assert_eq!(
-            parse_with_workspace("main@", &other_workspace_id),
-            Ok(main_wc)
-        );
+        insta::assert_debug_snapshot!(
+            parse("@").unwrap_err(),
+            @"WorkingCopyWithoutWorkspace");
+        insta::assert_debug_snapshot!(
+            parse("main@").unwrap(),
+            @r###"CommitRef(WorkingCopy(WorkspaceId("main")))"###);
+        insta::assert_debug_snapshot!(
+            parse_with_workspace("@", &main_workspace_id).unwrap(),
+            @r###"CommitRef(WorkingCopy(WorkspaceId("main")))"###);
+        insta::assert_debug_snapshot!(
+            parse_with_workspace("main@", &other_workspace_id).unwrap(),
+            @r###"CommitRef(WorkingCopy(WorkspaceId("main")))"###);
         // "@" in function argument must be quoted
-        assert_eq!(
-            parse("author(foo@)"),
-            Err(RevsetParseErrorKind::Expression(
-                "Expected expression of string pattern".to_string(),
-            ))
-        );
-        assert_eq!(
-            parse(r#"author("foo@")"#),
-            Ok(RevsetExpression::filter(RevsetFilterPredicate::Author(
-                StringPattern::Substring("foo@".to_string()),
-            )))
-        );
+        insta::assert_debug_snapshot!(
+            parse("author(foo@)").unwrap_err(),
+            @r###"Expression("Expected expression of string pattern")"###);
+        insta::assert_debug_snapshot!(
+            parse(r#"author("foo@")"#).unwrap(),
+            @r###"Filter(Author(Substring("foo@")))"###);
         // Parse a single symbol
-        assert_eq!(parse("foo"), Ok(foo_symbol.clone()));
+        insta::assert_debug_snapshot!(
+            parse("foo").unwrap(),
+            @r###"CommitRef(Symbol("foo"))"###);
         // Default arguments for *branches() are all ""
-        assert_eq!(parse("branches()"), parse(r#"branches("")"#));
-        assert_eq!(parse("remote_branches()"), parse(r#"remote_branches("")"#));
-        assert_eq!(
-            parse("remote_branches()"),
-            parse(r#"remote_branches("", "")"#)
-        );
+        insta::assert_debug_snapshot!(
+            parse("branches()").unwrap(),
+            @r###"CommitRef(Branches(Substring("")))"###);
+        insta::assert_debug_snapshot!(parse("remote_branches()").unwrap(), @r###"
+        CommitRef(
+            RemoteBranches {
+                branch_pattern: Substring(""),
+                remote_pattern: Substring(""),
+            },
+        )
+        "###);
+        insta::assert_debug_snapshot!(parse("remote_branches()").unwrap(), @r###"
+        CommitRef(
+            RemoteBranches {
+                branch_pattern: Substring(""),
+                remote_pattern: Substring(""),
+            },
+        )
+        "###);
         // Parse a quoted symbol
-        assert_eq!(parse("'foo'"), Ok(foo_symbol.clone()));
+        insta::assert_debug_snapshot!(
+            parse("'foo'").unwrap(),
+            @r###"CommitRef(Symbol("foo"))"###);
         // Parse the "parents" operator
-        assert_eq!(parse("foo-"), Ok(foo_symbol.parents()));
+        insta::assert_debug_snapshot!(parse("foo-").unwrap(), @r###"
+        Ancestors {
+            heads: CommitRef(Symbol("foo")),
+            generation: 1..2,
+        }
+        "###);
         // Parse the "children" operator
-        assert_eq!(parse("foo+"), Ok(foo_symbol.children()));
+        insta::assert_debug_snapshot!(parse("foo+").unwrap(), @r###"
+        Descendants {
+            roots: CommitRef(Symbol("foo")),
+            generation: 1..2,
+        }
+        "###);
         // Parse the "ancestors" operator
-        assert_eq!(parse("::foo"), Ok(foo_symbol.ancestors()));
+        insta::assert_debug_snapshot!(parse("::foo").unwrap(), @r###"
+        Ancestors {
+            heads: CommitRef(Symbol("foo")),
+            generation: 0..18446744073709551615,
+        }
+        "###);
         // Parse the "descendants" operator
-        assert_eq!(parse("foo::"), Ok(foo_symbol.descendants()));
+        insta::assert_debug_snapshot!(parse("foo::").unwrap(), @r###"
+        Descendants {
+            roots: CommitRef(Symbol("foo")),
+            generation: 0..18446744073709551615,
+        }
+        "###);
         // Parse the "dag range" operator
-        assert_eq!(parse("foo::bar"), Ok(foo_symbol.dag_range_to(&bar_symbol)));
+        insta::assert_debug_snapshot!(parse("foo::bar").unwrap(), @r###"
+        DagRange {
+            roots: CommitRef(Symbol("foo")),
+            heads: CommitRef(Symbol("bar")),
+        }
+        "###);
         // Parse the nullary "dag range" operator
-        assert_eq!(parse("::"), Ok(RevsetExpression::all()));
+        insta::assert_debug_snapshot!(parse("::").unwrap(), @"All");
         // Parse the "range" prefix operator
-        assert_eq!(
-            parse("..foo"),
-            Ok(RevsetExpression::root().range(&foo_symbol))
-        );
-        assert_eq!(
-            parse("foo.."),
-            Ok(foo_symbol.range(&RevsetExpression::visible_heads()))
-        );
-        assert_eq!(parse("foo..bar"), Ok(foo_symbol.range(&bar_symbol)));
+        insta::assert_debug_snapshot!(parse("..foo").unwrap(), @r###"
+        Range {
+            roots: CommitRef(Root),
+            heads: CommitRef(Symbol("foo")),
+            generation: 0..18446744073709551615,
+        }
+        "###);
+        insta::assert_debug_snapshot!(parse("foo..").unwrap(), @r###"
+        Range {
+            roots: CommitRef(Symbol("foo")),
+            heads: CommitRef(VisibleHeads),
+            generation: 0..18446744073709551615,
+        }
+        "###);
+        insta::assert_debug_snapshot!(parse("foo..bar").unwrap(), @r###"
+        Range {
+            roots: CommitRef(Symbol("foo")),
+            heads: CommitRef(Symbol("bar")),
+            generation: 0..18446744073709551615,
+        }
+        "###);
         // Parse the nullary "range" operator
-        assert_eq!(
-            parse(".."),
-            Ok(RevsetExpression::root().range(&RevsetExpression::visible_heads()))
-        );
+        insta::assert_debug_snapshot!(parse("..").unwrap(), @r###"
+        Range {
+            roots: CommitRef(Root),
+            heads: CommitRef(VisibleHeads),
+            generation: 0..18446744073709551615,
+        }
+        "###);
         // Parse the "negate" operator
-        assert_eq!(parse("~ foo"), Ok(foo_symbol.negated()));
+        insta::assert_debug_snapshot!(
+            parse("~ foo").unwrap(),
+            @r###"NotIn(CommitRef(Symbol("foo")))"###);
         // Parse the "intersection" operator
-        assert_eq!(parse("foo & bar"), Ok(foo_symbol.intersection(&bar_symbol)));
+        insta::assert_debug_snapshot!(parse("foo & bar").unwrap(), @r###"
+        Intersection(
+            CommitRef(Symbol("foo")),
+            CommitRef(Symbol("bar")),
+        )
+        "###);
         // Parse the "union" operator
-        assert_eq!(parse("foo | bar"), Ok(foo_symbol.union(&bar_symbol)));
+        insta::assert_debug_snapshot!(parse("foo | bar").unwrap(), @r###"
+        Union(
+            CommitRef(Symbol("foo")),
+            CommitRef(Symbol("bar")),
+        )
+        "###);
         // Parse the "difference" operator
-        assert_eq!(parse("foo ~ bar"), Ok(foo_symbol.minus(&bar_symbol)));
+        insta::assert_debug_snapshot!(parse("foo ~ bar").unwrap(), @r###"
+        Difference(
+            CommitRef(Symbol("foo")),
+            CommitRef(Symbol("bar")),
+        )
+        "###);
     }
 
     #[test]
     fn test_parse_revset_with_modifier() {
-        let foo_symbol = RevsetExpression::symbol("foo".to_owned());
-        assert_eq!(
-            parse_with_modifier("all:foo"),
-            Ok((foo_symbol.clone(), Some(RevsetModifier::All)))
-        );
+        let settings = insta_settings();
+        let _guard = settings.bind_to_scope();
+
+        insta::assert_debug_snapshot!(
+            parse_with_modifier("all:foo").unwrap(), @r###"
+        (
+            CommitRef(Symbol("foo")),
+            Some(All),
+        )
+        "###);
 
         // Top-level string pattern can't be parsed, which is an error anyway
-        assert_eq!(
-            parse_with_modifier(r#"exact:"foo""#),
-            Err(RevsetParseErrorKind::NoSuchModifier("exact".to_owned()))
-        );
+        insta::assert_debug_snapshot!(
+            parse_with_modifier(r#"exact:"foo""#).unwrap_err(),
+            @r###"NoSuchModifier("exact")"###);
     }
 
     #[test]
     fn test_parse_string_pattern() {
-        assert_eq!(
-            parse(r#"branches("foo")"#),
-            Ok(RevsetExpression::branches(StringPattern::Substring(
-                "foo".to_owned()
-            )))
-        );
-        assert_eq!(
-            parse(r#"branches(exact:"foo")"#),
-            Ok(RevsetExpression::branches(StringPattern::Exact(
-                "foo".to_owned()
-            )))
-        );
-        assert_eq!(
-            parse(r#"branches(substring:"foo")"#),
-            Ok(RevsetExpression::branches(StringPattern::Substring(
-                "foo".to_owned()
-            )))
-        );
-        assert_eq!(
-            parse(r#"branches(bad:"foo")"#),
-            Err(RevsetParseErrorKind::Expression(
-                "Invalid string pattern".to_owned()
-            ))
-        );
-        assert_eq!(
-            parse(r#"branches(exact::"foo")"#),
-            Err(RevsetParseErrorKind::Expression(
-                "Expected expression of string pattern".to_owned()
-            ))
-        );
-        assert_eq!(
-            parse(r#"branches(exact:"foo"+)"#),
-            Err(RevsetParseErrorKind::Expression(
-                "Expected expression of string pattern".to_owned()
-            ))
-        );
+        let settings = insta_settings();
+        let _guard = settings.bind_to_scope();
+
+        insta::assert_debug_snapshot!(
+            parse(r#"branches("foo")"#).unwrap(),
+            @r###"CommitRef(Branches(Substring("foo")))"###);
+        insta::assert_debug_snapshot!(
+            parse(r#"branches(exact:"foo")"#).unwrap(),
+            @r###"CommitRef(Branches(Exact("foo")))"###);
+        insta::assert_debug_snapshot!(
+            parse(r#"branches(substring:"foo")"#).unwrap(),
+            @r###"CommitRef(Branches(Substring("foo")))"###);
+        insta::assert_debug_snapshot!(
+            parse(r#"branches(bad:"foo")"#).unwrap_err(),
+            @r###"Expression("Invalid string pattern")"###);
+        insta::assert_debug_snapshot!(
+            parse(r#"branches(exact::"foo")"#).unwrap_err(),
+            @r###"Expression("Expected expression of string pattern")"###);
+        insta::assert_debug_snapshot!(
+            parse(r#"branches(exact:"foo"+)"#).unwrap_err(),
+            @r###"Expression("Expected expression of string pattern")"###);
 
         // String pattern isn't allowed at top level.
         assert_matches!(
@@ -2408,110 +2468,121 @@ mod tests {
 
     #[test]
     fn test_parse_revset_function() {
-        let foo_symbol = RevsetExpression::symbol("foo".to_string());
-        assert_eq!(parse("parents(foo)"), Ok(foo_symbol.parents()));
-        assert_eq!(parse("parents(\"foo\")"), Ok(foo_symbol.parents()));
-        assert_eq!(
-            parse("ancestors(parents(foo))"),
-            Ok(foo_symbol.parents().ancestors())
-        );
-        assert_eq!(
-            parse("parents(foo,foo)"),
-            Err(RevsetParseErrorKind::InvalidFunctionArguments {
-                name: "parents".to_string(),
-                message: "Expected 1 arguments".to_string()
-            })
-        );
-        assert_eq!(
-            parse("root()"),
-            Ok(Rc::new(RevsetExpression::CommitRef(RevsetCommitRef::Root)))
-        );
-        assert!(parse("root(a)").is_err());
-        assert_eq!(
-            parse(r#"description("")"#),
-            Ok(RevsetExpression::filter(
-                RevsetFilterPredicate::Description(StringPattern::Substring("".to_string()))
-            ))
-        );
-        assert_eq!(
-            parse("description(foo)"),
-            Ok(RevsetExpression::filter(
-                RevsetFilterPredicate::Description(StringPattern::Substring("foo".to_string()))
-            ))
-        );
-        assert_eq!(
-            parse("description(visible_heads())"),
-            Err(RevsetParseErrorKind::Expression(
-                "Expected expression of string pattern".to_string()
-            ))
-        );
-        assert_eq!(
-            parse("description(\"(foo)\")"),
-            Ok(RevsetExpression::filter(
-                RevsetFilterPredicate::Description(StringPattern::Substring("(foo)".to_string()))
-            ))
-        );
-        assert!(parse("mine(foo)").is_err());
-        assert_eq!(
-            parse("mine()"),
-            Ok(RevsetExpression::filter(RevsetFilterPredicate::Author(
-                StringPattern::Exact("test.user@example.com".to_string())
-            )))
-        );
-        assert_eq!(
-            parse_with_workspace("empty()", &WorkspaceId::default()),
-            Ok(
-                RevsetExpression::filter(RevsetFilterPredicate::File(FilesetExpression::all()))
-                    .negated()
-            )
-        );
-        assert!(parse_with_workspace("empty(foo)", &WorkspaceId::default()).is_err());
-        assert!(parse_with_workspace("file()", &WorkspaceId::default()).is_err());
-        assert_eq!(
-            parse_with_workspace("file(foo)", &WorkspaceId::default()),
-            Ok(RevsetExpression::filter(RevsetFilterPredicate::File(
-                FilesetExpression::prefix_path(RepoPathBuf::from_internal_string("foo"))
-            )))
-        );
-        assert_eq!(
-            parse_with_workspace(r#"file(file:"foo")"#, &WorkspaceId::default()),
-            Ok(RevsetExpression::filter(RevsetFilterPredicate::File(
-                FilesetExpression::file_path(RepoPathBuf::from_internal_string("foo"))
-            )))
-        );
-        assert_eq!(
-            parse_with_workspace("file(foo, bar, baz)", &WorkspaceId::default()),
-            Ok(RevsetExpression::filter(RevsetFilterPredicate::File(
-                FilesetExpression::union_all(vec![
-                    FilesetExpression::prefix_path(RepoPathBuf::from_internal_string("foo")),
-                    FilesetExpression::prefix_path(RepoPathBuf::from_internal_string("bar")),
-                    FilesetExpression::prefix_path(RepoPathBuf::from_internal_string("baz")),
-                ])
-            )))
-        );
-    }
+        let settings = insta_settings();
+        let _guard = settings.bind_to_scope();
 
-    #[test]
-    fn test_parse_revset_keyword_arguments() {
-        assert_eq!(
-            parse("remote_branches(remote=foo)").unwrap(),
-            parse(r#"remote_branches("", foo)"#).unwrap(),
-        );
-        assert_eq!(
-            parse("remote_branches(foo, remote=bar)").unwrap(),
-            parse(r#"remote_branches(foo, bar)"#).unwrap(),
-        );
         insta::assert_debug_snapshot!(
-            parse(r#"remote_branches(remote=foo, bar)"#).unwrap_err(),
-            @r###"
-        InvalidFunctionArguments {
-            name: "remote_branches",
-            message: "Positional argument follows keyword argument",
+            parse("parents(foo)").unwrap(), @r###"
+        Ancestors {
+            heads: CommitRef(Symbol("foo")),
+            generation: 1..2,
         }
         "###);
         insta::assert_debug_snapshot!(
-            parse(r#"remote_branches("", foo, remote=bar)"#).unwrap_err(),
-            @r###"
+            parse("parents(\"foo\")").unwrap(), @r###"
+        Ancestors {
+            heads: CommitRef(Symbol("foo")),
+            generation: 1..2,
+        }
+        "###);
+        insta::assert_debug_snapshot!(
+            parse("ancestors(parents(foo))").unwrap(), @r###"
+        Ancestors {
+            heads: Ancestors {
+                heads: CommitRef(Symbol("foo")),
+                generation: 1..2,
+            },
+            generation: 0..18446744073709551615,
+        }
+        "###);
+        insta::assert_debug_snapshot!(
+            parse("parents(foo,foo)").unwrap_err(), @r###"
+        InvalidFunctionArguments {
+            name: "parents",
+            message: "Expected 1 arguments",
+        }
+        "###);
+        insta::assert_debug_snapshot!(
+            parse("root()").unwrap(),
+            @"CommitRef(Root)");
+        assert!(parse("root(a)").is_err());
+        insta::assert_debug_snapshot!(
+            parse(r#"description("")"#).unwrap(),
+            @r###"Filter(Description(Substring("")))"###);
+        insta::assert_debug_snapshot!(
+            parse("description(foo)").unwrap(),
+            @r###"Filter(Description(Substring("foo")))"###);
+        insta::assert_debug_snapshot!(
+            parse("description(visible_heads())").unwrap_err(),
+            @r###"Expression("Expected expression of string pattern")"###);
+        insta::assert_debug_snapshot!(
+            parse("description(\"(foo)\")").unwrap(),
+            @r###"Filter(Description(Substring("(foo)")))"###);
+        assert!(parse("mine(foo)").is_err());
+        insta::assert_debug_snapshot!(
+            parse("mine()").unwrap(),
+            @r###"Filter(Author(Exact("test.user@example.com")))"###);
+        insta::assert_debug_snapshot!(
+            parse_with_workspace("empty()", &WorkspaceId::default()).unwrap(),
+            @"NotIn(Filter(File(All)))");
+        assert!(parse_with_workspace("empty(foo)", &WorkspaceId::default()).is_err());
+        assert!(parse_with_workspace("file()", &WorkspaceId::default()).is_err());
+        insta::assert_debug_snapshot!(
+            parse_with_workspace("file(foo)", &WorkspaceId::default()).unwrap(),
+            @r###"Filter(File(Pattern(PrefixPath("foo"))))"###);
+        insta::assert_debug_snapshot!(
+            parse_with_workspace(r#"file(file:"foo")"#, &WorkspaceId::default()).unwrap(),
+            @r###"Filter(File(Pattern(FilePath("foo"))))"###);
+        insta::assert_debug_snapshot!(
+            parse_with_workspace("file(foo, bar, baz)", &WorkspaceId::default()).unwrap(), @r###"
+        Filter(
+            File(
+                UnionAll(
+                    [
+                        Pattern(PrefixPath("foo")),
+                        Pattern(PrefixPath("bar")),
+                        Pattern(PrefixPath("baz")),
+                    ],
+                ),
+            ),
+        )
+        "###);
+    }
+
+    #[test]
+    fn test_parse_revset_keyword_arguments() {
+        let settings = insta_settings();
+        let _guard = settings.bind_to_scope();
+
+        insta::assert_debug_snapshot!(
+            parse("remote_branches(remote=foo)").unwrap(), @r###"
+        CommitRef(
+            RemoteBranches {
+                branch_pattern: Substring(""),
+                remote_pattern: Substring("foo"),
+            },
+        )
+        "###);
+        insta::assert_debug_snapshot!(
+            parse("remote_branches(foo, remote=bar)").unwrap(), @r###"
+        CommitRef(
+            RemoteBranches {
+                branch_pattern: Substring("foo"),
+                remote_pattern: Substring("bar"),
+            },
+        )
+        "###);
+        insta::assert_debug_snapshot!(
+            parse(r#"remote_branches(remote=foo, bar)"#).unwrap_err(),
+            @r###"
+        InvalidFunctionArguments {
+            name: "remote_branches",
+            message: "Positional argument follows keyword argument",
+        }
+        "###);
+        insta::assert_debug_snapshot!(
+            parse(r#"remote_branches("", foo, remote=bar)"#).unwrap_err(),
+            @r###"
         InvalidFunctionArguments {
             name: "remote_branches",
             message: "Got multiple values for keyword \"remote\"",
@@ -2537,126 +2608,162 @@ mod tests {
 
     #[test]
     fn test_expand_symbol_alias() {
-        assert_eq!(
-            parse_with_aliases("AB|c", [("AB", "a|b")]).unwrap(),
-            parse("(a|b)|c").unwrap()
-        );
+        let settings = insta_settings();
+        let _guard = settings.bind_to_scope();
+
+        insta::assert_debug_snapshot!(
+            parse_with_aliases("AB|c", [("AB", "a|b")]).unwrap(), @r###"
+        Union(
+            Union(
+                CommitRef(Symbol("a")),
+                CommitRef(Symbol("b")),
+            ),
+            CommitRef(Symbol("c")),
+        )
+        "###);
 
         // Alias can be substituted to string literal.
-        assert_eq!(
+        insta::assert_debug_snapshot!(
             parse_with_aliases_and_workspace("file(A)", [("A", "a")], &WorkspaceId::default())
                 .unwrap(),
-            parse_with_workspace("file(a)", &WorkspaceId::default()).unwrap()
-        );
+            @r###"Filter(File(Pattern(PrefixPath("a"))))"###);
 
         // Alias can be substituted to string pattern.
-        assert_eq!(
+        insta::assert_debug_snapshot!(
             parse_with_aliases("author(A)", [("A", "a")]).unwrap(),
-            parse("author(a)").unwrap()
-        );
+            @r###"Filter(Author(Substring("a")))"###);
         // However, parentheses are required because top-level x:y is parsed as
         // program modifier.
-        assert_eq!(
+        insta::assert_debug_snapshot!(
             parse_with_aliases("author(A)", [("A", "(exact:a)")]).unwrap(),
-            parse("author(exact:a)").unwrap()
-        );
+            @r###"Filter(Author(Exact("a")))"###);
 
         // Sub-expression alias cannot be substituted to modifier expression.
-        assert_eq!(
-            parse_with_aliases_and_modifier("A-", [("A", "all:a")]),
-            Err(RevsetParseErrorKind::BadAliasExpansion("A".to_owned()))
-        );
+        insta::assert_debug_snapshot!(
+            parse_with_aliases_and_modifier("A-", [("A", "all:a")]).unwrap_err(),
+            @r###"BadAliasExpansion("A")"###);
     }
 
     #[test]
     fn test_expand_function_alias() {
+        let settings = insta_settings();
+        let _guard = settings.bind_to_scope();
+
         // Pass string literal as parameter.
-        assert_eq!(
-            parse_with_aliases("F(a)", [("F(x)", "author(x)|committer(x)")]).unwrap(),
-            parse("author(a)|committer(a)").unwrap()
-        );
+        insta::assert_debug_snapshot!(
+            parse_with_aliases("F(a)", [("F(x)", "author(x)|committer(x)")]).unwrap(), @r###"
+        Union(
+            Filter(Author(Substring("a"))),
+            Filter(Committer(Substring("a"))),
+        )
+        "###);
     }
 
     #[test]
     fn test_optimize_subtree() {
+        let settings = insta_settings();
+        let _guard = settings.bind_to_scope();
+
         // Check that transform_expression_bottom_up() never rewrites enum variant
         // (e.g. Range -> DagRange) nor reorders arguments unintentionally.
 
-        assert_eq!(
-            optimize(parse("parents(branches() & all())").unwrap()),
-            RevsetExpression::branches(StringPattern::everything()).parents()
-        );
-        assert_eq!(
-            optimize(parse("children(branches() & all())").unwrap()),
-            RevsetExpression::branches(StringPattern::everything()).children()
-        );
-        assert_eq!(
-            optimize(parse("ancestors(branches() & all())").unwrap()),
-            RevsetExpression::branches(StringPattern::everything()).ancestors()
-        );
-        assert_eq!(
-            optimize(parse("descendants(branches() & all())").unwrap()),
-            RevsetExpression::branches(StringPattern::everything()).descendants()
-        );
+        insta::assert_debug_snapshot!(
+            optimize(parse("parents(branches() & all())").unwrap()), @r###"
+        Ancestors {
+            heads: CommitRef(Branches(Substring(""))),
+            generation: 1..2,
+        }
+        "###);
+        insta::assert_debug_snapshot!(
+            optimize(parse("children(branches() & all())").unwrap()), @r###"
+        Descendants {
+            roots: CommitRef(Branches(Substring(""))),
+            generation: 1..2,
+        }
+        "###);
+        insta::assert_debug_snapshot!(
+            optimize(parse("ancestors(branches() & all())").unwrap()), @r###"
+        Ancestors {
+            heads: CommitRef(Branches(Substring(""))),
+            generation: 0..18446744073709551615,
+        }
+        "###);
+        insta::assert_debug_snapshot!(
+            optimize(parse("descendants(branches() & all())").unwrap()), @r###"
+        Descendants {
+            roots: CommitRef(Branches(Substring(""))),
+            generation: 0..18446744073709551615,
+        }
+        "###);
 
-        assert_eq!(
-            optimize(parse("(branches() & all())..(all() & tags())").unwrap()),
-            RevsetExpression::branches(StringPattern::everything())
-                .range(&RevsetExpression::tags())
-        );
-        assert_eq!(
-            optimize(parse("(branches() & all())::(all() & tags())").unwrap()),
-            RevsetExpression::branches(StringPattern::everything())
-                .dag_range_to(&RevsetExpression::tags())
-        );
+        insta::assert_debug_snapshot!(
+            optimize(parse("(branches() & all())..(all() & tags())").unwrap()), @r###"
+        Range {
+            roots: CommitRef(Branches(Substring(""))),
+            heads: CommitRef(Tags),
+            generation: 0..18446744073709551615,
+        }
+        "###);
+        insta::assert_debug_snapshot!(
+            optimize(parse("(branches() & all())::(all() & tags())").unwrap()), @r###"
+        DagRange {
+            roots: CommitRef(Branches(Substring(""))),
+            heads: CommitRef(Tags),
+        }
+        "###);
 
-        assert_eq!(
+        insta::assert_debug_snapshot!(
             optimize(parse("heads(branches() & all())").unwrap()),
-            RevsetExpression::branches(StringPattern::everything()).heads()
-        );
-        assert_eq!(
+            @r###"Heads(CommitRef(Branches(Substring(""))))"###);
+        insta::assert_debug_snapshot!(
             optimize(parse("roots(branches() & all())").unwrap()),
-            RevsetExpression::branches(StringPattern::everything()).roots()
-        );
+            @r###"Roots(CommitRef(Branches(Substring(""))))"###);
 
-        assert_eq!(
-            optimize(parse("latest(branches() & all(), 2)").unwrap()),
-            RevsetExpression::branches(StringPattern::everything()).latest(2)
-        );
+        insta::assert_debug_snapshot!(
+            optimize(parse("latest(branches() & all(), 2)").unwrap()), @r###"
+        Latest {
+            candidates: CommitRef(Branches(Substring(""))),
+            count: 2,
+        }
+        "###);
 
-        assert_eq!(
-            optimize(parse("present(foo ~ bar)").unwrap()),
-            Rc::new(RevsetExpression::Present(
-                RevsetExpression::symbol("foo".to_owned())
-                    .minus(&RevsetExpression::symbol("bar".to_owned()))
-            ))
-        );
-        assert_eq!(
+        insta::assert_debug_snapshot!(
+            optimize(parse("present(foo ~ bar)").unwrap()), @r###"
+        Present(
+            Difference(
+                CommitRef(Symbol("foo")),
+                CommitRef(Symbol("bar")),
+            ),
+        )
+        "###);
+        insta::assert_debug_snapshot!(
             optimize(parse("present(branches() & all())").unwrap()),
-            Rc::new(RevsetExpression::Present(RevsetExpression::branches(
-                StringPattern::everything()
-            )))
-        );
+            @r###"Present(CommitRef(Branches(Substring(""))))"###);
 
-        assert_eq!(
+        insta::assert_debug_snapshot!(
             optimize(parse("~branches() & all()").unwrap()),
-            RevsetExpression::branches(StringPattern::everything()).negated()
-        );
-        assert_eq!(
-            optimize(parse("(branches() & all()) | (all() & tags())").unwrap()),
-            RevsetExpression::branches(StringPattern::everything())
-                .union(&RevsetExpression::tags())
-        );
-        assert_eq!(
-            optimize(parse("(branches() & all()) & (all() & tags())").unwrap()),
-            RevsetExpression::branches(StringPattern::everything())
-                .intersection(&RevsetExpression::tags())
-        );
-        assert_eq!(
-            optimize(parse("(branches() & all()) ~ (all() & tags())").unwrap()),
-            RevsetExpression::branches(StringPattern::everything())
-                .minus(&RevsetExpression::tags())
-        );
+            @r###"NotIn(CommitRef(Branches(Substring(""))))"###);
+        insta::assert_debug_snapshot!(
+            optimize(parse("(branches() & all()) | (all() & tags())").unwrap()), @r###"
+        Union(
+            CommitRef(Branches(Substring(""))),
+            CommitRef(Tags),
+        )
+        "###);
+        insta::assert_debug_snapshot!(
+            optimize(parse("(branches() & all()) & (all() & tags())").unwrap()), @r###"
+        Intersection(
+            CommitRef(Branches(Substring(""))),
+            CommitRef(Tags),
+        )
+        "###);
+        insta::assert_debug_snapshot!(
+            optimize(parse("(branches() & all()) ~ (all() & tags())").unwrap()), @r###"
+        Difference(
+            CommitRef(Branches(Substring(""))),
+            CommitRef(Tags),
+        )
+        "###);
     }
 
     #[test]
@@ -2686,9 +2793,9 @@ mod tests {
         // Only left subtree should be rewritten.
         let parsed = parse("(branches() & all()) | tags()").unwrap();
         let optimized = optimize(parsed.clone());
-        assert_eq!(
+        assert_matches!(
             unwrap_union(&optimized).0.as_ref(),
-            &RevsetExpression::CommitRef(RevsetCommitRef::Branches(StringPattern::everything()))
+            RevsetExpression::CommitRef(RevsetCommitRef::Branches(_))
         );
         assert!(Rc::ptr_eq(
             unwrap_union(&parsed).1,
@@ -2702,173 +2809,88 @@ mod tests {
             unwrap_union(&parsed).0,
             unwrap_union(&optimized).0
         ));
-        assert_eq!(
+        assert_matches!(
             unwrap_union(&optimized).1.as_ref(),
-            &RevsetExpression::CommitRef(RevsetCommitRef::Tags),
+            RevsetExpression::CommitRef(RevsetCommitRef::Tags)
         );
     }
 
     #[test]
     fn test_optimize_difference() {
+        let settings = insta_settings();
+        let _guard = settings.bind_to_scope();
+
         insta::assert_debug_snapshot!(optimize(parse("foo & ~bar").unwrap()), @r###"
         Difference(
-            CommitRef(
-                Symbol(
-                    "foo",
-                ),
-            ),
-            CommitRef(
-                Symbol(
-                    "bar",
-                ),
-            ),
+            CommitRef(Symbol("foo")),
+            CommitRef(Symbol("bar")),
         )
         "###);
         insta::assert_debug_snapshot!(optimize(parse("~foo & bar").unwrap()), @r###"
         Difference(
-            CommitRef(
-                Symbol(
-                    "bar",
-                ),
-            ),
-            CommitRef(
-                Symbol(
-                    "foo",
-                ),
-            ),
+            CommitRef(Symbol("bar")),
+            CommitRef(Symbol("foo")),
         )
         "###);
         insta::assert_debug_snapshot!(optimize(parse("~foo & bar & ~baz").unwrap()), @r###"
         Difference(
             Difference(
-                CommitRef(
-                    Symbol(
-                        "bar",
-                    ),
-                ),
-                CommitRef(
-                    Symbol(
-                        "foo",
-                    ),
-                ),
-            ),
-            CommitRef(
-                Symbol(
-                    "baz",
-                ),
+                CommitRef(Symbol("bar")),
+                CommitRef(Symbol("foo")),
             ),
+            CommitRef(Symbol("baz")),
         )
         "###);
         insta::assert_debug_snapshot!(optimize(parse("(all() & ~foo) & bar").unwrap()), @r###"
         Difference(
-            CommitRef(
-                Symbol(
-                    "bar",
-                ),
-            ),
-            CommitRef(
-                Symbol(
-                    "foo",
-                ),
-            ),
+            CommitRef(Symbol("bar")),
+            CommitRef(Symbol("foo")),
         )
         "###);
 
         // Binary difference operation should go through the same optimization passes.
-        insta::assert_debug_snapshot!(optimize(parse("all() ~ foo").unwrap()), @r###"
-        NotIn(
-            CommitRef(
-                Symbol(
-                    "foo",
-                ),
-            ),
-        )
-        "###);
+        insta::assert_debug_snapshot!(
+            optimize(parse("all() ~ foo").unwrap()),
+            @r###"NotIn(CommitRef(Symbol("foo")))"###);
         insta::assert_debug_snapshot!(optimize(parse("foo ~ bar").unwrap()), @r###"
         Difference(
-            CommitRef(
-                Symbol(
-                    "foo",
-                ),
-            ),
-            CommitRef(
-                Symbol(
-                    "bar",
-                ),
-            ),
+            CommitRef(Symbol("foo")),
+            CommitRef(Symbol("bar")),
         )
         "###);
         insta::assert_debug_snapshot!(optimize(parse("(all() ~ foo) & bar").unwrap()), @r###"
         Difference(
-            CommitRef(
-                Symbol(
-                    "bar",
-                ),
-            ),
-            CommitRef(
-                Symbol(
-                    "foo",
-                ),
-            ),
+            CommitRef(Symbol("bar")),
+            CommitRef(Symbol("foo")),
         )
         "###);
 
         // Range expression.
         insta::assert_debug_snapshot!(optimize(parse("::foo & ~::bar").unwrap()), @r###"
         Range {
-            roots: CommitRef(
-                Symbol(
-                    "bar",
-                ),
-            ),
-            heads: CommitRef(
-                Symbol(
-                    "foo",
-                ),
-            ),
+            roots: CommitRef(Symbol("bar")),
+            heads: CommitRef(Symbol("foo")),
             generation: 0..18446744073709551615,
         }
         "###);
         insta::assert_debug_snapshot!(optimize(parse("~::foo & ::bar").unwrap()), @r###"
         Range {
-            roots: CommitRef(
-                Symbol(
-                    "foo",
-                ),
-            ),
-            heads: CommitRef(
-                Symbol(
-                    "bar",
-                ),
-            ),
+            roots: CommitRef(Symbol("foo")),
+            heads: CommitRef(Symbol("bar")),
             generation: 0..18446744073709551615,
         }
         "###);
         insta::assert_debug_snapshot!(optimize(parse("foo..").unwrap()), @r###"
         Range {
-            roots: CommitRef(
-                Symbol(
-                    "foo",
-                ),
-            ),
-            heads: CommitRef(
-                VisibleHeads,
-            ),
+            roots: CommitRef(Symbol("foo")),
+            heads: CommitRef(VisibleHeads),
             generation: 0..18446744073709551615,
         }
         "###);
         insta::assert_debug_snapshot!(optimize(parse("foo..bar").unwrap()), @r###"
         Range {
-            roots: CommitRef(
-                Symbol(
-                    "foo",
-                ),
-            ),
-            heads: CommitRef(
-                Symbol(
-                    "bar",
-                ),
-            ),
+            roots: CommitRef(Symbol("foo")),
+            heads: CommitRef(Symbol("bar")),
             generation: 0..18446744073709551615,
         }
         "###);
@@ -2876,79 +2898,42 @@ mod tests {
         // Double/triple negates.
         insta::assert_debug_snapshot!(optimize(parse("foo & ~~bar").unwrap()), @r###"
         Intersection(
-            CommitRef(
-                Symbol(
-                    "foo",
-                ),
-            ),
-            CommitRef(
-                Symbol(
-                    "bar",
-                ),
-            ),
+            CommitRef(Symbol("foo")),
+            CommitRef(Symbol("bar")),
         )
         "###);
         insta::assert_debug_snapshot!(optimize(parse("foo & ~~~bar").unwrap()), @r###"
         Difference(
-            CommitRef(
-                Symbol(
-                    "foo",
-                ),
-            ),
-            CommitRef(
-                Symbol(
-                    "bar",
-                ),
-            ),
+            CommitRef(Symbol("foo")),
+            CommitRef(Symbol("bar")),
         )
         "###);
         insta::assert_debug_snapshot!(optimize(parse("~(all() & ~foo) & bar").unwrap()), @r###"
         Intersection(
-            CommitRef(
-                Symbol(
-                    "foo",
-                ),
-            ),
-            CommitRef(
-                Symbol(
-                    "bar",
-                ),
-            ),
+            CommitRef(Symbol("foo")),
+            CommitRef(Symbol("bar")),
         )
         "###);
 
         // Should be better than '(all() & ~foo) & (all() & ~bar)'.
         insta::assert_debug_snapshot!(optimize(parse("~foo & ~bar").unwrap()), @r###"
         Difference(
-            NotIn(
-                CommitRef(
-                    Symbol(
-                        "foo",
-                    ),
-                ),
-            ),
-            CommitRef(
-                Symbol(
-                    "bar",
-                ),
-            ),
+            NotIn(CommitRef(Symbol("foo"))),
+            CommitRef(Symbol("bar")),
         )
         "###);
     }
 
     #[test]
     fn test_optimize_not_in_ancestors() {
+        let settings = insta_settings();
+        let _guard = settings.bind_to_scope();
+
         // '~(::foo)' is equivalent to 'foo..'.
         insta::assert_debug_snapshot!(optimize(parse("~(::foo)").unwrap()), @r###"
         Range {
-            roots: CommitRef(
-                Symbol(
-                    "foo",
-                ),
-            ),
-            heads: CommitRef(
-                VisibleHeads,
-            ),
+            roots: CommitRef(Symbol("foo")),
+            heads: CommitRef(VisibleHeads),
             generation: 0..18446744073709551615,
         }
         "###);
@@ -2957,32 +2942,20 @@ mod tests {
         insta::assert_debug_snapshot!(optimize(parse("~(::foo-)").unwrap()), @r###"
         Range {
             roots: Ancestors {
-                heads: CommitRef(
-                    Symbol(
-                        "foo",
-                    ),
-                ),
+                heads: CommitRef(Symbol("foo")),
                 generation: 1..2,
             },
-            heads: CommitRef(
-                VisibleHeads,
-            ),
+            heads: CommitRef(VisibleHeads),
             generation: 0..18446744073709551615,
         }
         "###);
         insta::assert_debug_snapshot!(optimize(parse("~(::foo--)").unwrap()), @r###"
         Range {
             roots: Ancestors {
-                heads: CommitRef(
-                    Symbol(
-                        "foo",
-                    ),
-                ),
+                heads: CommitRef(Symbol("foo")),
                 generation: 2..3,
             },
-            heads: CommitRef(
-                VisibleHeads,
-            ),
+            heads: CommitRef(VisibleHeads),
             generation: 0..18446744073709551615,
         }
         "###);
@@ -2991,11 +2964,7 @@ mod tests {
         insta::assert_debug_snapshot!(optimize(parse("~ancestors(foo, 1)").unwrap()), @r###"
         NotIn(
             Ancestors {
-                heads: CommitRef(
-                    Symbol(
-                        "foo",
-                    ),
-                ),
+                heads: CommitRef(Symbol("foo")),
                 generation: 0..1,
             },
         )
@@ -3003,11 +2972,7 @@ mod tests {
         insta::assert_debug_snapshot!(optimize(parse("~ancestors(foo-, 1)").unwrap()), @r###"
         NotIn(
             Ancestors {
-                heads: CommitRef(
-                    Symbol(
-                        "foo",
-                    ),
-                ),
+                heads: CommitRef(Symbol("foo")),
                 generation: 1..2,
             },
         )
@@ -3016,38 +2981,21 @@ mod tests {
 
     #[test]
     fn test_optimize_filter_difference() {
+        let settings = insta_settings();
+        let _guard = settings.bind_to_scope();
+
         // '~empty()' -> '~~file(*)' -> 'file(*)'
-        insta::assert_debug_snapshot!(optimize(parse("~empty()").unwrap()), @r###"
-        Filter(
-            File(
-                All,
-            ),
-        )
-        "###);
+        insta::assert_debug_snapshot!(optimize(parse("~empty()").unwrap()), @"Filter(File(All))");
 
         // '& baz' can be moved into the filter node, and form a difference node.
         insta::assert_debug_snapshot!(
             optimize(parse("(author(foo) & ~bar) & baz").unwrap()), @r###"
         Intersection(
             Difference(
-                CommitRef(
-                    Symbol(
-                        "baz",
-                    ),
-                ),
-                CommitRef(
-                    Symbol(
-                        "bar",
-                    ),
-                ),
-            ),
-            Filter(
-                Author(
-                    Substring(
-                        "foo",
-                    ),
-                ),
+                CommitRef(Symbol("baz")),
+                CommitRef(Symbol("bar")),
             ),
+            Filter(Author(Substring("foo"))),
         )
         "###);
 
@@ -3055,46 +3003,18 @@ mod tests {
         insta::assert_debug_snapshot!(
             optimize(parse("~foo & author(bar)").unwrap()), @r###"
         Intersection(
-            NotIn(
-                CommitRef(
-                    Symbol(
-                        "foo",
-                    ),
-                ),
-            ),
-            Filter(
-                Author(
-                    Substring(
-                        "bar",
-                    ),
-                ),
-            ),
+            NotIn(CommitRef(Symbol("foo"))),
+            Filter(Author(Substring("bar"))),
         )
         "###);
         insta::assert_debug_snapshot!(
             optimize(parse("~foo & (author(bar) | baz)").unwrap()), @r###"
         Intersection(
-            NotIn(
-                CommitRef(
-                    Symbol(
-                        "foo",
-                    ),
-                ),
-            ),
+            NotIn(CommitRef(Symbol("foo"))),
             AsFilter(
                 Union(
-                    Filter(
-                        Author(
-                            Substring(
-                                "bar",
-                            ),
-                        ),
-                    ),
-                    CommitRef(
-                        Symbol(
-                            "baz",
-                        ),
-                    ),
+                    Filter(Author(Substring("bar"))),
+                    CommitRef(Symbol("baz")),
                 ),
             ),
         )
@@ -3104,85 +3024,37 @@ mod tests {
         insta::assert_debug_snapshot!(
             optimize(parse("author(foo) ~ bar").unwrap()), @r###"
         Intersection(
-            NotIn(
-                CommitRef(
-                    Symbol(
-                        "bar",
-                    ),
-                ),
-            ),
-            Filter(
-                Author(
-                    Substring(
-                        "foo",
-                    ),
-                ),
-            ),
+            NotIn(CommitRef(Symbol("bar"))),
+            Filter(Author(Substring("foo"))),
         )
         "###);
     }
 
     #[test]
     fn test_optimize_filter_intersection() {
-        insta::assert_debug_snapshot!(optimize(parse("author(foo)").unwrap()), @r###"
-        Filter(
-            Author(
-                Substring(
-                    "foo",
-                ),
-            ),
-        )
-        "###);
+        let settings = insta_settings();
+        let _guard = settings.bind_to_scope();
+
+        insta::assert_debug_snapshot!(
+            optimize(parse("author(foo)").unwrap()), @r###"Filter(Author(Substring("foo")))"###);
 
         insta::assert_debug_snapshot!(optimize(parse("foo & description(bar)").unwrap()), @r###"
         Intersection(
-            CommitRef(
-                Symbol(
-                    "foo",
-                ),
-            ),
-            Filter(
-                Description(
-                    Substring(
-                        "bar",
-                    ),
-                ),
-            ),
+            CommitRef(Symbol("foo")),
+            Filter(Description(Substring("bar"))),
         )
         "###);
         insta::assert_debug_snapshot!(optimize(parse("author(foo) & bar").unwrap()), @r###"
         Intersection(
-            CommitRef(
-                Symbol(
-                    "bar",
-                ),
-            ),
-            Filter(
-                Author(
-                    Substring(
-                        "foo",
-                    ),
-                ),
-            ),
+            CommitRef(Symbol("bar")),
+            Filter(Author(Substring("foo"))),
         )
         "###);
         insta::assert_debug_snapshot!(
             optimize(parse("author(foo) & committer(bar)").unwrap()), @r###"
         Intersection(
-            Filter(
-                Author(
-                    Substring(
-                        "foo",
-                    ),
-                ),
-            ),
-            Filter(
-                Committer(
-                    Substring(
-                        "bar",
-                    ),
-                ),
-            ),
+            Filter(Author(Substring("foo"))),
+            Filter(Committer(Substring("bar"))),
         )
         "###);
 
@@ -3190,135 +3062,49 @@ mod tests {
             optimize(parse("foo & description(bar) & author(baz)").unwrap()), @r###"
         Intersection(
             Intersection(
-                CommitRef(
-                    Symbol(
-                        "foo",
-                    ),
-                ),
-                Filter(
-                    Description(
-                        Substring(
-                            "bar",
-                        ),
-                    ),
-                ),
-            ),
-            Filter(
-                Author(
-                    Substring(
-                        "baz",
-                    ),
-                ),
+                CommitRef(Symbol("foo")),
+                Filter(Description(Substring("bar"))),
             ),
+            Filter(Author(Substring("baz"))),
         )
         "###);
         insta::assert_debug_snapshot!(
             optimize(parse("committer(foo) & bar & author(baz)").unwrap()), @r###"
         Intersection(
             Intersection(
-                CommitRef(
-                    Symbol(
-                        "bar",
-                    ),
-                ),
-                Filter(
-                    Committer(
-                        Substring(
-                            "foo",
-                        ),
-                    ),
-                ),
-            ),
-            Filter(
-                Author(
-                    Substring(
-                        "baz",
-                    ),
-                ),
+                CommitRef(Symbol("bar")),
+                Filter(Committer(Substring("foo"))),
             ),
+            Filter(Author(Substring("baz"))),
         )
         "###);
         insta::assert_debug_snapshot!(
             optimize(parse_with_workspace("committer(foo) & file(bar) & baz", &WorkspaceId::default()).unwrap()), @r###"
         Intersection(
             Intersection(
-                CommitRef(
-                    Symbol(
-                        "baz",
-                    ),
-                ),
-                Filter(
-                    Committer(
-                        Substring(
-                            "foo",
-                        ),
-                    ),
-                ),
-            ),
-            Filter(
-                File(
-                    Pattern(
-                        PrefixPath(
-                            "bar",
-                        ),
-                    ),
-                ),
+                CommitRef(Symbol("baz")),
+                Filter(Committer(Substring("foo"))),
             ),
+            Filter(File(Pattern(PrefixPath("bar")))),
         )
         "###);
         insta::assert_debug_snapshot!(
             optimize(parse_with_workspace("committer(foo) & file(bar) & author(baz)", &WorkspaceId::default()).unwrap()), @r###"
         Intersection(
             Intersection(
-                Filter(
-                    Committer(
-                        Substring(
-                            "foo",
-                        ),
-                    ),
-                ),
-                Filter(
-                    File(
-                        Pattern(
-                            PrefixPath(
-                                "bar",
-                            ),
-                        ),
-                    ),
-                ),
-            ),
-            Filter(
-                Author(
-                    Substring(
-                        "baz",
-                    ),
-                ),
+                Filter(Committer(Substring("foo"))),
+                Filter(File(Pattern(PrefixPath("bar")))),
             ),
+            Filter(Author(Substring("baz"))),
         )
         "###);
         insta::assert_debug_snapshot!(optimize(parse_with_workspace("foo & file(bar) & baz", &WorkspaceId::default()).unwrap()), @r###"
         Intersection(
             Intersection(
-                CommitRef(
-                    Symbol(
-                        "foo",
-                    ),
-                ),
-                CommitRef(
-                    Symbol(
-                        "baz",
-                    ),
-                ),
-            ),
-            Filter(
-                File(
-                    Pattern(
-                        PrefixPath(
-                            "bar",
-                        ),
-                    ),
-                ),
+                CommitRef(Symbol("foo")),
+                CommitRef(Symbol("baz")),
             ),
+            Filter(File(Pattern(PrefixPath("bar")))),
         )
         "###);
 
@@ -3327,32 +3113,12 @@ mod tests {
         Intersection(
             Intersection(
                 Intersection(
-                    CommitRef(
-                        Symbol(
-                            "foo",
-                        ),
-                    ),
-                    CommitRef(
-                        Symbol(
-                            "qux",
-                        ),
-                    ),
-                ),
-                Filter(
-                    Description(
-                        Substring(
-                            "bar",
-                        ),
-                    ),
-                ),
-            ),
-            Filter(
-                Author(
-                    Substring(
-                        "baz",
-                    ),
+                    CommitRef(Symbol("foo")),
+                    CommitRef(Symbol("qux")),
                 ),
+                Filter(Description(Substring("bar"))),
             ),
+            Filter(Author(Substring("baz"))),
         )
         "###);
         insta::assert_debug_snapshot!(
@@ -3360,71 +3126,31 @@ mod tests {
         Intersection(
             Intersection(
                 Intersection(
-                    CommitRef(
-                        Symbol(
-                            "foo",
-                        ),
-                    ),
+                    CommitRef(Symbol("foo")),
                     Ancestors {
-                        heads: Filter(
-                            Author(
-                                Substring(
-                                    "baz",
-                                ),
-                            ),
-                        ),
+                        heads: Filter(Author(Substring("baz"))),
                         generation: 1..2,
                     },
                 ),
-                CommitRef(
-                    Symbol(
-                        "qux",
-                    ),
-                ),
-            ),
-            Filter(
-                Description(
-                    Substring(
-                        "bar",
-                    ),
-                ),
+                CommitRef(Symbol("qux")),
             ),
+            Filter(Description(Substring("bar"))),
         )
         "###);
         insta::assert_debug_snapshot!(
             optimize(parse("foo & description(bar) & parents(author(baz) & qux)").unwrap()), @r###"
         Intersection(
             Intersection(
-                CommitRef(
-                    Symbol(
-                        "foo",
-                    ),
-                ),
+                CommitRef(Symbol("foo")),
                 Ancestors {
                     heads: Intersection(
-                        CommitRef(
-                            Symbol(
-                                "qux",
-                            ),
-                        ),
-                        Filter(
-                            Author(
-                                Substring(
-                                    "baz",
-                                ),
-                            ),
-                        ),
+                        CommitRef(Symbol("qux")),
+                        Filter(Author(Substring("baz"))),
                     ),
                     generation: 1..2,
                 },
             ),
-            Filter(
-                Description(
-                    Substring(
-                        "bar",
-                    ),
-                ),
-            ),
+            Filter(Description(Substring("bar"))),
         )
         "###);
 
@@ -3436,46 +3162,16 @@ mod tests {
                 Intersection(
                     Intersection(
                         Intersection(
-                            CommitRef(
-                                Symbol(
-                                    "a",
-                                ),
-                            ),
-                            CommitRef(
-                                Symbol(
-                                    "b",
-                                ),
-                            ),
-                        ),
-                        CommitRef(
-                            Symbol(
-                                "c",
-                            ),
-                        ),
-                    ),
-                    Filter(
-                        Author(
-                            Substring(
-                                "A",
-                            ),
+                            CommitRef(Symbol("a")),
+                            CommitRef(Symbol("b")),
                         ),
+                        CommitRef(Symbol("c")),
                     ),
+                    Filter(Author(Substring("A"))),
                 ),
-                Filter(
-                    Author(
-                        Substring(
-                            "B",
-                        ),
-                    ),
-                ),
-            ),
-            Filter(
-                Author(
-                    Substring(
-                        "C",
-                    ),
-                ),
+                Filter(Author(Substring("B"))),
             ),
+            Filter(Author(Substring("C"))),
         )
         "###);
         insta::assert_debug_snapshot!(
@@ -3486,53 +3182,19 @@ mod tests {
                 Intersection(
                     Intersection(
                         Intersection(
-                            CommitRef(
-                                Symbol(
-                                    "a",
-                                ),
-                            ),
+                            CommitRef(Symbol("a")),
                             Intersection(
-                                CommitRef(
-                                    Symbol(
-                                        "b",
-                                    ),
-                                ),
-                                CommitRef(
-                                    Symbol(
-                                        "c",
-                                    ),
-                                ),
-                            ),
-                        ),
-                        CommitRef(
-                            Symbol(
-                                "d",
+                                CommitRef(Symbol("b")),
+                                CommitRef(Symbol("c")),
                             ),
                         ),
+                        CommitRef(Symbol("d")),
                     ),
-                    Filter(
-                        Author(
-                            Substring(
-                                "A",
-                            ),
-                        ),
-                    ),
-                ),
-                Filter(
-                    Author(
-                        Substring(
-                            "B",
-                        ),
-                    ),
-                ),
-            ),
-            Filter(
-                Author(
-                    Substring(
-                        "C",
-                    ),
+                    Filter(Author(Substring("A"))),
                 ),
+                Filter(Author(Substring("B"))),
             ),
+            Filter(Author(Substring("C"))),
         )
         "###);
 
@@ -3542,54 +3204,27 @@ mod tests {
             @r###"
         Intersection(
             Intersection(
-                CommitRef(
-                    Symbol(
-                        "foo",
-                    ),
-                ),
-                Filter(
-                    Description(
-                        Substring(
-                            "bar",
-                        ),
-                    ),
-                ),
-            ),
-            Filter(
-                Author(
-                    Substring(
-                        "baz",
-                    ),
-                ),
+                CommitRef(Symbol("foo")),
+                Filter(Description(Substring("bar"))),
             ),
+            Filter(Author(Substring("baz"))),
         )
         "###);
     }
 
     #[test]
     fn test_optimize_filter_subtree() {
+        let settings = insta_settings();
+        let _guard = settings.bind_to_scope();
+
         insta::assert_debug_snapshot!(
             optimize(parse("(author(foo) | bar) & baz").unwrap()), @r###"
         Intersection(
-            CommitRef(
-                Symbol(
-                    "baz",
-                ),
-            ),
+            CommitRef(Symbol("baz")),
             AsFilter(
                 Union(
-                    Filter(
-                        Author(
-                            Substring(
-                                "foo",
-                            ),
-                        ),
-                    ),
-                    CommitRef(
-                        Symbol(
-                            "bar",
-                        ),
-                    ),
+                    Filter(Author(Substring("foo"))),
+                    CommitRef(Symbol("bar")),
                 ),
             ),
         )
@@ -3599,46 +3234,22 @@ mod tests {
             optimize(parse("(foo | committer(bar)) & description(baz) & qux").unwrap()), @r###"
         Intersection(
             Intersection(
-                CommitRef(
-                    Symbol(
-                        "qux",
-                    ),
-                ),
+                CommitRef(Symbol("qux")),
                 AsFilter(
                     Union(
-                        CommitRef(
-                            Symbol(
-                                "foo",
-                            ),
-                        ),
-                        Filter(
-                            Committer(
-                                Substring(
-                                    "bar",
-                                ),
-                            ),
-                        ),
-                    ),
-                ),
-            ),
-            Filter(
-                Description(
-                    Substring(
-                        "baz",
+                        CommitRef(Symbol("foo")),
+                        Filter(Committer(Substring("bar"))),
                     ),
                 ),
             ),
+            Filter(Description(Substring("baz"))),
         )
         "###);
 
         insta::assert_debug_snapshot!(
             optimize(parse("(~present(author(foo) & bar) | baz) & qux").unwrap()), @r###"
         Intersection(
-            CommitRef(
-                Symbol(
-                    "qux",
-                ),
-            ),
+            CommitRef(Symbol("qux")),
             AsFilter(
                 Union(
                     AsFilter(
@@ -3646,28 +3257,14 @@ mod tests {
                             AsFilter(
                                 Present(
                                     Intersection(
-                                        CommitRef(
-                                            Symbol(
-                                                "bar",
-                                            ),
-                                        ),
-                                        Filter(
-                                            Author(
-                                                Substring(
-                                                    "foo",
-                                                ),
-                                            ),
-                                        ),
+                                        CommitRef(Symbol("bar")),
+                                        Filter(Author(Substring("foo"))),
                                     ),
                                 ),
                             ),
                         ),
                     ),
-                    CommitRef(
-                        Symbol(
-                            "baz",
-                        ),
-                    ),
+                    CommitRef(Symbol("baz")),
                 ),
             ),
         )
@@ -3683,71 +3280,29 @@ mod tests {
                 Intersection(
                     Intersection(
                         Intersection(
-                            CommitRef(
-                                Symbol(
-                                    "a",
-                                ),
-                            ),
-                            CommitRef(
-                                Symbol(
-                                    "b",
-                                ),
-                            ),
-                        ),
-                        CommitRef(
-                            Symbol(
-                                "c",
-                            ),
+                            CommitRef(Symbol("a")),
+                            CommitRef(Symbol("b")),
                         ),
+                        CommitRef(Symbol("c")),
                     ),
                     AsFilter(
                         Union(
-                            Filter(
-                                Author(
-                                    Substring(
-                                        "A",
-                                    ),
-                                ),
-                            ),
-                            CommitRef(
-                                Symbol(
-                                    "0",
-                                ),
-                            ),
+                            Filter(Author(Substring("A"))),
+                            CommitRef(Symbol("0")),
                         ),
                     ),
                 ),
                 AsFilter(
                     Union(
-                        Filter(
-                            Author(
-                                Substring(
-                                    "B",
-                                ),
-                            ),
-                        ),
-                        CommitRef(
-                            Symbol(
-                                "1",
-                            ),
-                        ),
+                        Filter(Author(Substring("B"))),
+                        CommitRef(Symbol("1")),
                     ),
                 ),
             ),
             AsFilter(
                 Union(
-                    Filter(
-                        Author(
-                            Substring(
-                                "C",
-                            ),
-                        ),
-                    ),
-                    CommitRef(
-                        Symbol(
-                            "2",
-                        ),
-                    ),
+                    Filter(Author(Substring("C"))),
+                    CommitRef(Symbol("2")),
                 ),
             ),
         )
@@ -3756,34 +3311,25 @@ mod tests {
 
     #[test]
     fn test_optimize_ancestors() {
+        let settings = insta_settings();
+        let _guard = settings.bind_to_scope();
+
         // Typical scenario: fold nested parents()
         insta::assert_debug_snapshot!(optimize(parse("foo--").unwrap()), @r###"
         Ancestors {
-            heads: CommitRef(
-                Symbol(
-                    "foo",
-                ),
-            ),
+            heads: CommitRef(Symbol("foo")),
             generation: 2..3,
         }
         "###);
         insta::assert_debug_snapshot!(optimize(parse("::(foo---)").unwrap()), @r###"
         Ancestors {
-            heads: CommitRef(
-                Symbol(
-                    "foo",
-                ),
-            ),
+            heads: CommitRef(Symbol("foo")),
             generation: 3..18446744073709551615,
         }
         "###);
         insta::assert_debug_snapshot!(optimize(parse("(::foo)---").unwrap()), @r###"
         Ancestors {
-            heads: CommitRef(
-                Symbol(
-                    "foo",
-                ),
-            ),
+            heads: CommitRef(Symbol("foo")),
             generation: 3..18446744073709551615,
         }
         "###);
@@ -3792,11 +3338,7 @@ mod tests {
         insta::assert_debug_snapshot!(optimize(parse("foo---+").unwrap()), @r###"
         Descendants {
             roots: Ancestors {
-                heads: CommitRef(
-                    Symbol(
-                        "foo",
-                    ),
-                ),
+                heads: CommitRef(Symbol("foo")),
                 generation: 3..4,
             },
             generation: 1..2,
@@ -3806,16 +3348,8 @@ mod tests {
         // For 'roots..heads', heads can be folded.
         insta::assert_debug_snapshot!(optimize(parse("foo..(bar--)").unwrap()), @r###"
         Range {
-            roots: CommitRef(
-                Symbol(
-                    "foo",
-                ),
-            ),
-            heads: CommitRef(
-                Symbol(
-                    "bar",
-                ),
-            ),
+            roots: CommitRef(Symbol("foo")),
+            heads: CommitRef(Symbol("bar")),
             generation: 2..18446744073709551615,
         }
         "###);
@@ -3823,18 +3357,10 @@ mod tests {
         insta::assert_debug_snapshot!(optimize(parse("(foo--)..(bar---)").unwrap()), @r###"
         Range {
             roots: Ancestors {
-                heads: CommitRef(
-                    Symbol(
-                        "foo",
-                    ),
-                ),
+                heads: CommitRef(Symbol("foo")),
                 generation: 2..3,
             },
-            heads: CommitRef(
-                Symbol(
-                    "bar",
-                ),
-            ),
+            heads: CommitRef(Symbol("bar")),
             generation: 3..18446744073709551615,
         }
         "###);
@@ -3843,19 +3369,11 @@ mod tests {
             optimize(parse("~ancestors(foo, 2) & ::bar").unwrap()), @r###"
         Difference(
             Ancestors {
-                heads: CommitRef(
-                    Symbol(
-                        "bar",
-                    ),
-                ),
+                heads: CommitRef(Symbol("bar")),
                 generation: 0..18446744073709551615,
             },
             Ancestors {
-                heads: CommitRef(
-                    Symbol(
-                        "foo",
-                    ),
-                ),
+                heads: CommitRef(Symbol("foo")),
                 generation: 0..2,
             },
         )
@@ -3866,16 +3384,8 @@ mod tests {
         insta::assert_debug_snapshot!(optimize(parse("(foo..bar)--").unwrap()), @r###"
         Ancestors {
             heads: Range {
-                roots: CommitRef(
-                    Symbol(
-                        "foo",
-                    ),
-                ),
-                heads: CommitRef(
-                    Symbol(
-                        "bar",
-                    ),
-                ),
+                roots: CommitRef(Symbol("foo")),
+                heads: CommitRef(Symbol("bar")),
                 generation: 0..18446744073709551615,
             },
             generation: 2..3,
@@ -3883,22 +3393,10 @@ mod tests {
         "###);
         insta::assert_debug_snapshot!(optimize(parse("foo..(bar..baz)").unwrap()), @r###"
         Range {
-            roots: CommitRef(
-                Symbol(
-                    "foo",
-                ),
-            ),
+            roots: CommitRef(Symbol("foo")),
             heads: Range {
-                roots: CommitRef(
-                    Symbol(
-                        "bar",
-                    ),
-                ),
-                heads: CommitRef(
-                    Symbol(
-                        "baz",
-                    ),
-                ),
+                roots: CommitRef(Symbol("bar")),
+                heads: CommitRef(Symbol("baz")),
                 generation: 0..18446744073709551615,
             },
             generation: 0..18446744073709551615,
@@ -3909,11 +3407,7 @@ mod tests {
         insta::assert_debug_snapshot!(
             optimize(parse("ancestors(ancestors(foo), 0)").unwrap()), @r###"
         Ancestors {
-            heads: CommitRef(
-                Symbol(
-                    "foo",
-                ),
-            ),
+            heads: CommitRef(Symbol("foo")),
             generation: 0..0,
         }
         "###
@@ -3921,11 +3415,7 @@ mod tests {
         insta::assert_debug_snapshot!(
             optimize(parse("ancestors(ancestors(foo, 0))").unwrap()), @r###"
         Ancestors {
-            heads: CommitRef(
-                Symbol(
-                    "foo",
-                ),
-            ),
+            heads: CommitRef(Symbol("foo")),
             generation: 0..0,
         }
         "###
@@ -3934,34 +3424,25 @@ mod tests {
 
     #[test]
     fn test_optimize_descendants() {
+        let settings = insta_settings();
+        let _guard = settings.bind_to_scope();
+
         // Typical scenario: fold nested children()
         insta::assert_debug_snapshot!(optimize(parse("foo++").unwrap()), @r###"
         Descendants {
-            roots: CommitRef(
-                Symbol(
-                    "foo",
-                ),
-            ),
+            roots: CommitRef(Symbol("foo")),
             generation: 2..3,
         }
         "###);
         insta::assert_debug_snapshot!(optimize(parse("(foo+++)::").unwrap()), @r###"
         Descendants {
-            roots: CommitRef(
-                Symbol(
-                    "foo",
-                ),
-            ),
+            roots: CommitRef(Symbol("foo")),
             generation: 3..18446744073709551615,
         }
         "###);
         insta::assert_debug_snapshot!(optimize(parse("(foo::)+++").unwrap()), @r###"
         Descendants {
-            roots: CommitRef(
-                Symbol(
-                    "foo",
-                ),
-            ),
+            roots: CommitRef(Symbol("foo")),
             generation: 3..18446744073709551615,
         }
         "###);
@@ -3970,11 +3451,7 @@ mod tests {
         insta::assert_debug_snapshot!(optimize(parse("foo+++-").unwrap()), @r###"
         Ancestors {
             heads: Descendants {
-                roots: CommitRef(
-                    Symbol(
-                        "foo",
-                    ),
-                ),
+                roots: CommitRef(Symbol("foo")),
                 generation: 3..4,
             },
             generation: 1..2,
@@ -3987,18 +3464,10 @@ mod tests {
         insta::assert_debug_snapshot!(optimize(parse("(foo++)::bar").unwrap()), @r###"
         DagRange {
             roots: Descendants {
-                roots: CommitRef(
-                    Symbol(
-                        "foo",
-                    ),
-                ),
+                roots: CommitRef(Symbol("foo")),
                 generation: 2..3,
             },
-            heads: CommitRef(
-                Symbol(
-                    "bar",
-                ),
-            ),
+            heads: CommitRef(Symbol("bar")),
         }
         "###);
     }
diff --git a/lib/src/revset_parser.rs b/lib/src/revset_parser.rs
index d8c439819f..e7fef5f7e4 100644
--- a/lib/src/revset_parser.rs
+++ b/lib/src/revset_parser.rs
@@ -233,7 +233,7 @@ impl AliasExpandError for RevsetParseError {
 
     fn within_alias_expansion(self, id: AliasId<'_>, span: pest::Span<'_>) -> Self {
         let kind = match id {
-            AliasId::Symbol(_) | AliasId::Function(_) => {
+            AliasId::Symbol(_) | AliasId::Function(..) => {
                 RevsetParseErrorKind::BadAliasExpansion(id.to_string())
             }
             AliasId::Parameter(_) => RevsetParseErrorKind::BadParameterExpansion(id.to_string()),
@@ -1274,6 +1274,37 @@ mod tests {
         assert!(aliases_map.insert("a@b", "none()").is_err());
     }
 
+    #[test]
+    fn test_parse_revset_alias_func_decl() {
+        let mut aliases_map = RevsetAliasesMap::new();
+        aliases_map.insert("func()", r#""is function 0""#).unwrap();
+        aliases_map
+            .insert("func(a, b)", r#""is function 2""#)
+            .unwrap();
+        aliases_map.insert("func(a)", r#""is function a""#).unwrap();
+        aliases_map.insert("func(b)", r#""is function b""#).unwrap();
+
+        let (id, params, defn) = aliases_map.get_function("func", 0).unwrap();
+        assert_eq!(id, AliasId::Function("func", &[]));
+        assert!(params.is_empty());
+        assert_eq!(defn, r#""is function 0""#);
+
+        let (id, params, defn) = aliases_map.get_function("func", 1).unwrap();
+        assert_eq!(id, AliasId::Function("func", &["b".to_owned()]));
+        assert_eq!(params, ["b"]);
+        assert_eq!(defn, r#""is function b""#);
+
+        let (id, params, defn) = aliases_map.get_function("func", 2).unwrap();
+        assert_eq!(
+            id,
+            AliasId::Function("func", &["a".to_owned(), "b".to_owned()])
+        );
+        assert_eq!(params, ["a", "b"]);
+        assert_eq!(defn, r#""is function 2""#);
+
+        assert!(aliases_map.get_function("func", 3).is_none());
+    }
+
     #[test]
     fn test_parse_revset_alias_formal_parameter() {
         let mut aliases_map = RevsetAliasesMap::new();
@@ -1542,6 +1573,12 @@ mod tests {
             parse_normalized("a|b")
         );
 
+        // Not recursion because functions are overloaded by arity.
+        assert_eq!(
+            with_aliases([("F(x)", "F(x,b)"), ("F(x,y)", "x|y")]).parse_normalized("F(a)"),
+            parse_normalized("a|b")
+        );
+
         // Arguments should be resolved in the current scope.
         assert_eq!(
             with_aliases([("F(x,y)", "x|y")]).parse_normalized("F(a::y,b::x)"),
@@ -1613,6 +1650,26 @@ mod tests {
                 message: "Expected 2 arguments".to_owned()
             }
         );
+        assert_eq!(
+            with_aliases([("F(x)", "x"), ("F(x,y)", "x|y")])
+                .parse("F()")
+                .unwrap_err()
+                .kind,
+            RevsetParseErrorKind::InvalidFunctionArguments {
+                name: "F".to_owned(),
+                message: "Expected 1 to 2 arguments".to_owned()
+            }
+        );
+        assert_eq!(
+            with_aliases([("F()", "x"), ("F(x,y)", "x|y")])
+                .parse("F(a)")
+                .unwrap_err()
+                .kind,
+            RevsetParseErrorKind::InvalidFunctionArguments {
+                name: "F".to_owned(),
+                message: "Expected 0, 2 arguments".to_owned()
+            }
+        );
 
         // Keyword argument isn't supported for now.
         assert_eq!(
@@ -1632,7 +1689,14 @@ mod tests {
                 .parse("F(a)")
                 .unwrap_err()
                 .kind,
-            RevsetParseErrorKind::BadAliasExpansion("F()".to_owned())
+            RevsetParseErrorKind::BadAliasExpansion("F(x)".to_owned())
+        );
+        assert_eq!(
+            with_aliases([("F(x)", "F(x,b)"), ("F(x,y)", "F(x|y)")])
+                .parse("F(a)")
+                .unwrap_err()
+                .kind,
+            RevsetParseErrorKind::BadAliasExpansion("F(x)".to_owned())
         );
     }
 }
diff --git a/lib/src/settings.rs b/lib/src/settings.rs
index 8497ced2a6..c0a17ef3b2 100644
--- a/lib/src/settings.rs
+++ b/lib/src/settings.rs
@@ -23,7 +23,7 @@ use rand_chacha::ChaCha20Rng;
 
 use crate::backend::{ChangeId, Commit, Signature, Timestamp};
 use crate::fmt_util::binary_prefix;
-use crate::fsmonitor::FsmonitorKind;
+use crate::fsmonitor::FsmonitorSettings;
 use crate::signing::SignBehavior;
 
 #[derive(Debug, Clone)]
@@ -164,12 +164,8 @@ impl UserSettings {
         self.config.get_string("user.email").unwrap_or_default()
     }
 
-    pub fn fsmonitor_kind(&self) -> Result<FsmonitorKind, config::ConfigError> {
-        match self.config.get_string("core.fsmonitor") {
-            Ok(fsmonitor_kind) => Ok(fsmonitor_kind.parse()?),
-            Err(config::ConfigError::NotFound(_)) => Ok(FsmonitorKind::None),
-            Err(err) => Err(err),
-        }
+    pub fn fsmonitor_settings(&self) -> Result<FsmonitorSettings, config::ConfigError> {
+        FsmonitorSettings::from_config(&self.config)
     }
 
     // Must not be changed to avoid git pushing older commits with no set email
diff --git a/lib/src/view.rs b/lib/src/view.rs
index 1125bd0b2b..4906de0aa0 100644
--- a/lib/src/view.rs
+++ b/lib/src/view.rs
@@ -96,25 +96,6 @@ impl View {
         self.data.head_ids.remove(head_id);
     }
 
-    /// Returns true if any local or remote branch of the given `name` exists.
-    #[must_use]
-    pub fn has_branch(&self, name: &str) -> bool {
-        self.data.local_branches.contains_key(name)
-            || self
-                .data
-                .remote_views
-                .values()
-                .any(|remote_view| remote_view.branches.contains_key(name))
-    }
-
-    // TODO: maybe rename to forget_branch() because this seems unusual operation?
-    pub fn remove_branch(&mut self, name: &str) {
-        self.data.local_branches.remove(name);
-        for remote_view in self.data.remote_views.values_mut() {
-            remote_view.branches.remove(name);
-        }
-    }
-
     /// Iterates local branch `(name, target)`s in lexicographical order.
     pub fn local_branches(&self) -> impl Iterator<Item = (&str, &RefTarget)> {
         self.data
diff --git a/lib/src/working_copy.rs b/lib/src/working_copy.rs
index 5760487e5a..cb52c0e27d 100644
--- a/lib/src/working_copy.rs
+++ b/lib/src/working_copy.rs
@@ -24,7 +24,7 @@ use thiserror::Error;
 
 use crate::backend::{BackendError, MergedTreeId};
 use crate::commit::Commit;
-use crate::fsmonitor::FsmonitorKind;
+use crate::fsmonitor::FsmonitorSettings;
 use crate::gitignore::{GitIgnoreError, GitIgnoreFile};
 use crate::op_store::{OperationId, WorkspaceId};
 use crate::repo_path::{RepoPath, RepoPathBuf};
@@ -150,8 +150,8 @@ pub enum SnapshotError {
         path: PathBuf,
     },
     /// Reading or writing from the commit backend failed.
-    #[error("Internal backend error")]
-    InternalBackendError(#[from] BackendError),
+    #[error(transparent)]
+    BackendError(#[from] BackendError),
     /// A file was larger than the specified maximum file size for new
     /// (previously untracked) files.
     #[error("New file {path} of size ~{size} exceeds snapshot.max-new-file-size ({max_size})")]
@@ -189,7 +189,7 @@ pub struct SnapshotOptions<'a> {
     /// The fsmonitor (e.g. Watchman) to use, if any.
     // TODO: Should we make this a field on `LocalWorkingCopy` instead since it's quite specific to
     // that implementation?
-    pub fsmonitor_kind: FsmonitorKind,
+    pub fsmonitor_settings: FsmonitorSettings,
     /// A callback for the UI to display progress.
     pub progress: Option<&'a SnapshotProgress<'a>>,
     /// The size of the largest file that should be allowed to become tracked
@@ -205,7 +205,7 @@ impl SnapshotOptions<'_> {
     pub fn empty_for_test() -> Self {
         SnapshotOptions {
             base_ignores: GitIgnoreFile::empty(),
-            fsmonitor_kind: FsmonitorKind::None,
+            fsmonitor_settings: FsmonitorSettings::None,
             progress: None,
             max_new_file_size: u64::MAX,
         }
diff --git a/lib/tests/test_conflicts.rs b/lib/tests/test_conflicts.rs
index deda8fe538..6876508945 100644
--- a/lib/tests/test_conflicts.rs
+++ b/lib/tests/test_conflicts.rs
@@ -839,13 +839,161 @@ fn test_update_conflict_from_content_modify_delete() {
     );
 }
 
+#[test]
+fn test_update_conflict_from_content_simplified_conflict() {
+    let test_repo = TestRepo::init();
+    let store = test_repo.repo.store();
+
+    let path = RepoPath::from_internal_string("dir/file");
+    let base_file_id = testutils::write_file(store, path, "line 1\nline 2\nline 3\n");
+    let left_file_id = testutils::write_file(store, path, "left 1\nline 2\nleft 3\n");
+    let right_file_id = testutils::write_file(store, path, "right 1\nline 2\nright 3\n");
+    // Conflict: left - base + base - base + right
+    let conflict = Merge::from_removes_adds(
+        vec![Some(base_file_id.clone()), Some(base_file_id.clone())],
+        vec![
+            Some(left_file_id.clone()),
+            Some(base_file_id.clone()),
+            Some(right_file_id.clone()),
+        ],
+    );
+    let simplified_conflict = conflict.clone().simplify();
+
+    // If the content is unchanged compared to the materialized value, we get the
+    // old conflict id back. Both the simplified and unsimplified materialized
+    // conflicts should return the old conflict id.
+    let materialized = materialize_conflict_string(store, path, &conflict);
+    let materialized_simplified = materialize_conflict_string(store, path, &simplified_conflict);
+    let parse = |content| {
+        update_from_content(&conflict, store, path, content)
+            .block_on()
+            .unwrap()
+    };
+    insta::assert_snapshot!(
+        materialized,
+        @r###"
+    <<<<<<< Conflict 1 of 2
+    +++++++ Contents of side #1
+    left 1
+    %%%%%%% Changes from base #1 to side #2
+     line 1
+    %%%%%%% Changes from base #2 to side #3
+    -line 1
+    +right 1
+    >>>>>>> Conflict 1 of 2 ends
+    line 2
+    <<<<<<< Conflict 2 of 2
+    +++++++ Contents of side #1
+    left 3
+    %%%%%%% Changes from base #1 to side #2
+     line 3
+    %%%%%%% Changes from base #2 to side #3
+    -line 3
+    +right 3
+    >>>>>>> Conflict 2 of 2 ends
+    "###
+    );
+    insta::assert_snapshot!(
+        materialized_simplified,
+        @r###"
+    <<<<<<< Conflict 1 of 2
+    %%%%%%% Changes from base to side #1
+    -line 1
+    +left 1
+    +++++++ Contents of side #2
+    right 1
+    >>>>>>> Conflict 1 of 2 ends
+    line 2
+    <<<<<<< Conflict 2 of 2
+    %%%%%%% Changes from base to side #1
+    -line 3
+    +left 3
+    +++++++ Contents of side #2
+    right 3
+    >>>>>>> Conflict 2 of 2 ends
+    "###
+    );
+    assert_eq!(parse(materialized.as_bytes()), conflict);
+    assert_eq!(parse(materialized_simplified.as_bytes()), conflict);
+
+    // If the conflict is resolved, we get a normal merge back to indicate that.
+    let expected_file_id = testutils::write_file(store, path, "resolved 1\nline 2\nresolved 3\n");
+    assert_eq!(
+        parse(b"resolved 1\nline 2\nresolved 3\n"),
+        Merge::normal(expected_file_id)
+    );
+
+    // If the conflict is partially resolved, we get a new conflict back.
+    // This should work with both the simplified and unsimplified conflict.
+    let new_conflict = parse(indoc! {b"
+        resolved 1
+        line 2
+        <<<<<<< Conflict 2 of 2
+        +++++++ Contents of side #1
+        edited left 3
+        %%%%%%% Changes from base #1 to side #2
+         edited line 3
+        %%%%%%% Changes from base #2 to side #3
+        -edited line 3
+        +edited right 3
+        >>>>>>> Conflict 2 of 2 ends
+    "});
+    let new_simplified_conflict = parse(indoc! {b"
+        resolved 1
+        line 2
+        <<<<<<< Conflict 2 of 2
+        %%%%%%% Changes from base to side #1
+        -edited line 3
+        +edited left 3
+        +++++++ Contents of side #2
+        edited right 3
+        >>>>>>> Conflict 2 of 2 ends
+    "});
+    assert_ne!(new_conflict, conflict);
+    assert_ne!(new_simplified_conflict, conflict);
+    // Calculate expected new FileIds
+    let new_base_file_id =
+        testutils::write_file(store, path, "resolved 1\nline 2\nedited line 3\n");
+    let new_left_file_id =
+        testutils::write_file(store, path, "resolved 1\nline 2\nedited left 3\n");
+    let new_right_file_id =
+        testutils::write_file(store, path, "resolved 1\nline 2\nedited right 3\n");
+    assert_eq!(
+        new_conflict,
+        Merge::from_removes_adds(
+            vec![
+                Some(new_base_file_id.clone()),
+                Some(new_base_file_id.clone())
+            ],
+            vec![
+                Some(new_left_file_id.clone()),
+                Some(new_base_file_id.clone()),
+                Some(new_right_file_id.clone())
+            ]
+        )
+    );
+    assert_eq!(
+        new_simplified_conflict,
+        Merge::from_removes_adds(
+            vec![Some(base_file_id.clone()), Some(new_base_file_id.clone())],
+            vec![
+                Some(new_left_file_id.clone()),
+                Some(base_file_id.clone()),
+                Some(new_right_file_id.clone())
+            ]
+        )
+    );
+}
+
 fn materialize_conflict_string(
     store: &Store,
     path: &RepoPath,
     conflict: &Merge<Option<FileId>>,
 ) -> String {
     let mut result: Vec<u8> = vec![];
-    let contents = extract_as_single_hunk(conflict, store, path).block_on();
+    let contents = extract_as_single_hunk(conflict, store, path)
+        .block_on()
+        .unwrap();
     materialize_merge_result(&contents, &mut result).unwrap();
     String::from_utf8(result).unwrap()
 }
diff --git a/lib/tests/test_git.rs b/lib/tests/test_git.rs
index 3f8a98a8cb..5ae15842f0 100644
--- a/lib/tests/test_git.rs
+++ b/lib/tests/test_git.rs
@@ -534,7 +534,7 @@ fn test_import_refs_reimport_with_deleted_remote_ref() {
             state: RemoteRefState::Tracking,
         },
     );
-    assert!(view.has_branch("main")); // branch #3 of 3
+    assert!(view.get_local_branch("main").is_present()); // branch #3 of 3
 
     // Simulate fetching from a remote where feature-remote-only and
     // feature-remote-and-local branches were deleted. This leads to the
@@ -550,8 +550,11 @@ fn test_import_refs_reimport_with_deleted_remote_ref() {
     let view = repo.view();
     // The local branches were indeed deleted
     assert_eq!(view.branches().count(), 2);
-    assert!(view.has_branch("main"));
-    assert!(!view.has_branch("feature-remote-only"));
+    assert!(view.get_local_branch("main").is_present());
+    assert!(view.get_local_branch("feature-remote-only").is_absent());
+    assert!(view
+        .get_remote_branch("feature-remote-only", "origin")
+        .is_absent());
     assert!(view
         .get_local_branch("feature-remote-and-local")
         .is_absent());
@@ -653,7 +656,7 @@ fn test_import_refs_reimport_with_moved_remote_ref() {
             state: RemoteRefState::Tracking,
         },
     );
-    assert!(view.has_branch("main")); // branch #3 of 3
+    assert!(view.get_local_branch("main").is_present()); // branch #3 of 3
 
     // Simulate fetching from a remote where feature-remote-only and
     // feature-remote-and-local branches were moved. This leads to the
@@ -711,7 +714,7 @@ fn test_import_refs_reimport_with_moved_remote_ref() {
             state: RemoteRefState::Tracking,
         },
     );
-    assert!(view.has_branch("main")); // branch #3 of 3
+    assert!(view.get_local_branch("main").is_present()); // branch #3 of 3
     let expected_heads = hashset! {
             jj_id(&commit_main),
             jj_id(&new_commit_remote_and_local),
@@ -1185,9 +1188,13 @@ fn test_import_some_refs() {
         view.get_remote_branch("feature4", "origin"),
         &commit_feat4_remote_ref
     );
-    assert!(!view.has_branch("main"));
+    assert!(view.get_local_branch("main").is_absent());
+    assert!(view.get_remote_branch("main", "git").is_absent());
+    assert!(view.get_remote_branch("main", "origin").is_absent());
     assert!(!view.heads().contains(&jj_id(&commit_main)));
-    assert!(!view.has_branch("ignored"));
+    assert!(view.get_local_branch("ignored").is_absent());
+    assert!(view.get_remote_branch("ignored", "git").is_absent());
+    assert!(view.get_remote_branch("ignored", "origin").is_absent());
     assert!(!view.heads().contains(&jj_id(&commit_ign)));
 
     // Delete branch feature1, feature3 and feature4 in git repository and import
@@ -2375,7 +2382,11 @@ fn test_fetch_prune_deleted_ref() {
     )
     .unwrap();
     // Test the setup
-    assert!(tx.mut_repo().has_branch("main"));
+    assert!(tx.mut_repo().get_local_branch("main").is_present());
+    assert!(tx
+        .mut_repo()
+        .get_remote_branch("main", "origin")
+        .is_present());
 
     test_data
         .origin_repo
@@ -2394,7 +2405,11 @@ fn test_fetch_prune_deleted_ref() {
     )
     .unwrap();
     assert_eq!(stats.import_stats.abandoned_commits, vec![jj_id(&commit)]);
-    assert!(!tx.mut_repo().has_branch("main"));
+    assert!(tx.mut_repo().get_local_branch("main").is_absent());
+    assert!(tx
+        .mut_repo()
+        .get_remote_branch("main", "origin")
+        .is_absent());
 }
 
 #[test]
diff --git a/lib/tests/test_local_working_copy.rs b/lib/tests/test_local_working_copy.rs
index 7ff7527910..361aa7aed7 100644
--- a/lib/tests/test_local_working_copy.rs
+++ b/lib/tests/test_local_working_copy.rs
@@ -19,10 +19,11 @@ use std::os::unix::net::UnixListener;
 use std::path::Path;
 use std::sync::Arc;
 
+use indoc::indoc;
 use itertools::Itertools;
 use jj_lib::backend::{MergedTreeId, TreeId, TreeValue};
 use jj_lib::file_util::{check_symlink_support, try_symlink};
-use jj_lib::fsmonitor::FsmonitorKind;
+use jj_lib::fsmonitor::FsmonitorSettings;
 use jj_lib::local_working_copy::LocalWorkingCopy;
 use jj_lib::merge::{Merge, MergedTreeValue};
 use jj_lib::merged_tree::{MergedTree, MergedTreeBuilder};
@@ -602,6 +603,118 @@ fn test_checkout_discard() {
     assert!(!reloaded_wc.file_states().unwrap().contains_path(file2_path));
 }
 
+#[test]
+fn test_materialize_snapshot_conflicted_files() {
+    let settings = testutils::user_settings();
+    let mut test_workspace = TestWorkspace::init(&settings);
+    let repo = &test_workspace.repo.clone();
+    let ws = &mut test_workspace.workspace;
+    let workspace_root = ws.workspace_root().clone();
+
+    // Create tree with 3-sided conflict, with file1 and file2 having different
+    // conflicts:
+    // file1: A - A + A - B + C
+    // file2: A - B + C - D + D
+    let file1_path = RepoPath::from_internal_string("file1");
+    let file2_path = RepoPath::from_internal_string("file2");
+    let side1_tree = create_tree(repo, &[(file1_path, "a\n"), (file2_path, "1\n")]);
+    let base1_tree = create_tree(repo, &[(file1_path, "a\n"), (file2_path, "2\n")]);
+    let side2_tree = create_tree(repo, &[(file1_path, "a\n"), (file2_path, "4\n")]);
+    let base2_tree = create_tree(repo, &[(file1_path, "b\n"), (file2_path, "3\n")]);
+    let side3_tree = create_tree(repo, &[(file1_path, "c\n"), (file2_path, "3\n")]);
+    let merged_tree = side1_tree
+        .merge(&base1_tree, &side2_tree)
+        .unwrap()
+        .merge(&base2_tree, &side3_tree)
+        .unwrap();
+    let commit = commit_with_tree(repo.store(), merged_tree.id());
+
+    let stats = ws.check_out(repo.op_id().clone(), None, &commit).unwrap();
+    assert_eq!(
+        stats,
+        CheckoutStats {
+            updated_files: 0,
+            added_files: 2,
+            removed_files: 0,
+            skipped_files: 0,
+        }
+    );
+
+    // Even though the tree-level conflict is a 3-sided conflict, each file is
+    // materialized as a 2-sided conflict.
+    let file1_value = merged_tree.path_value(file1_path).unwrap();
+    let file2_value = merged_tree.path_value(file2_path).unwrap();
+    assert_eq!(file1_value.num_sides(), 3);
+    assert_eq!(file2_value.num_sides(), 3);
+    insta::assert_snapshot!(std::fs::read_to_string(file1_path.to_fs_path(&workspace_root)).ok().unwrap(), @r###"
+    <<<<<<< Conflict 1 of 1
+    %%%%%%% Changes from base to side #1
+    -b
+    +a
+    +++++++ Contents of side #2
+    c
+    >>>>>>> Conflict 1 of 1 ends
+    "###);
+    insta::assert_snapshot!(std::fs::read_to_string(file2_path.to_fs_path(&workspace_root)).ok().unwrap(), @r###"
+    <<<<<<< Conflict 1 of 1
+    %%%%%%% Changes from base to side #1
+    -2
+    +1
+    +++++++ Contents of side #2
+    4
+    >>>>>>> Conflict 1 of 1 ends
+    "###);
+
+    // Editing a conflicted file should correctly propagate updates to each of
+    // the conflicting trees.
+    testutils::write_working_copy_file(
+        &workspace_root,
+        file1_path,
+        indoc! {"
+            <<<<<<< Conflict 1 of 1
+            %%%%%%% Changes from base to side #1
+            -b_edited
+            +a_edited
+            +++++++ Contents of side #2
+            c_edited
+            >>>>>>> Conflict 1 of 1 ends
+        "},
+    );
+
+    let edited_tree = test_workspace.snapshot().unwrap();
+    let edited_file_value = edited_tree.path_value(file1_path).unwrap();
+    let edited_file_values = edited_file_value.iter().flatten().collect_vec();
+    assert_eq!(edited_file_values.len(), 5);
+
+    let get_file_id = |value: &TreeValue| match value {
+        TreeValue::File { id, .. } => id.clone(),
+        _ => panic!("unexpected value: {value:#?}"),
+    };
+    // The file IDs with indices 0 and 1 are the original unedited file values
+    // which were simplified.
+    let edited_file_file_id_0 = get_file_id(edited_file_values[0]);
+    assert_eq!(
+        testutils::read_file(repo.store(), file1_path, &edited_file_file_id_0),
+        b"a\n"
+    );
+    assert_eq!(edited_file_values[0], edited_file_values[1]);
+    let edited_file_file_id_2 = get_file_id(edited_file_values[2]);
+    assert_eq!(
+        testutils::read_file(repo.store(), file1_path, &edited_file_file_id_2),
+        b"a_edited\n"
+    );
+    let edited_file_file_id_3 = get_file_id(edited_file_values[3]);
+    assert_eq!(
+        testutils::read_file(repo.store(), file1_path, &edited_file_file_id_3),
+        b"b_edited\n"
+    );
+    let edited_file_file_id_4 = get_file_id(edited_file_values[4]);
+    assert_eq!(
+        testutils::read_file(repo.store(), file1_path, &edited_file_file_id_4),
+        b"c_edited\n"
+    );
+}
+
 #[test]
 fn test_snapshot_racy_timestamps() {
     // Tests that file modifications are detected even if they happen the same
@@ -1070,7 +1183,7 @@ fn test_fsmonitor() {
         locked_ws
             .locked_wc()
             .snapshot(SnapshotOptions {
-                fsmonitor_kind: FsmonitorKind::Test {
+                fsmonitor_settings: FsmonitorSettings::Test {
                     changed_files: fs_paths,
                 },
                 ..SnapshotOptions::empty_for_test()
diff --git a/mkdocs.yml b/mkdocs.yml
index fbebd7a5d4..d53162cb44 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -99,6 +99,8 @@ nav:
 
 - Testimonials: 'testimonials.md'
 
+- "Community-built tools": 'community_tools.md'
+
 - Concepts:
       - 'Working Copy': 'working-copy.md'
       - 'Branches': 'branches.md'
diff --git a/poetry.lock b/poetry.lock
index ba65649597..3a6c3de111 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -1,4 +1,4 @@
-# This file is automatically @generated by Poetry 1.8.3 and should not be changed by hand.
+# This file is automatically @generated by Poetry 1.8.2 and should not be changed by hand.
 
 [[package]]
 name = "babel"
@@ -510,6 +510,7 @@ optional = false
 python-versions = ">=3.6"
 files = [
     {file = "mkdocs-redirects-1.2.1.tar.gz", hash = "sha256:9420066d70e2a6bb357adf86e67023dcdca1857f97f07c7fe450f8f1fb42f861"},
+    {file = "mkdocs_redirects-1.2.1-py3-none-any.whl", hash = "sha256:497089f9e0219e7389304cffefccdfa1cac5ff9509f2cb706f4c9b221726dffb"},
 ]
 
 [package.dependencies]
@@ -664,6 +665,7 @@ files = [
     {file = "PyYAML-6.0.1-cp311-cp311-win_amd64.whl", hash = "sha256:bf07ee2fef7014951eeb99f56f39c9bb4af143d8aa3c21b1677805985307da34"},
     {file = "PyYAML-6.0.1-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:855fb52b0dc35af121542a76b9a84f8d1cd886ea97c84703eaa6d88e37a2ad28"},
     {file = "PyYAML-6.0.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:40df9b996c2b73138957fe23a16a4f0ba614f4c0efce1e9406a184b6d07fa3a9"},
+    {file = "PyYAML-6.0.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a08c6f0fe150303c1c6b71ebcd7213c2858041a7e01975da3a99aed1e7a378ef"},
     {file = "PyYAML-6.0.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6c22bec3fbe2524cde73d7ada88f6566758a8f7227bfbf93a408a9d86bcc12a0"},
     {file = "PyYAML-6.0.1-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:8d4e9c88387b0f5c7d5f281e55304de64cf7f9c0021a3525bd3b1c542da3b0e4"},
     {file = "PyYAML-6.0.1-cp312-cp312-win32.whl", hash = "sha256:d483d2cdf104e7c9fa60c544d92981f12ad66a457afae824d146093b8c294c54"},
@@ -834,13 +836,13 @@ files = [
 
 [[package]]
 name = "urllib3"
-version = "2.2.1"
+version = "2.2.2"
 description = "HTTP library with thread-safe connection pooling, file post, and more."
 optional = false
 python-versions = ">=3.8"
 files = [
-    {file = "urllib3-2.2.1-py3-none-any.whl", hash = "sha256:450b20ec296a467077128bff42b73080516e71b56ff59a60a02bef2232c4fa9d"},
-    {file = "urllib3-2.2.1.tar.gz", hash = "sha256:d0570876c61ab9e520d776c38acbbb5b05a776d3f9ff98a5c8fd5162a444cf19"},
+    {file = "urllib3-2.2.2-py3-none-any.whl", hash = "sha256:a448b2f64d686155468037e1ace9f2d2199776e17f0a46610480d311f73e3472"},
+    {file = "urllib3-2.2.2.tar.gz", hash = "sha256:dd505485549a7a552833da5e6063639d0d177c04f23bc3864e41e5dc5f612168"},
 ]
 
 [package.extras]