diff --git a/CHANGELOG.md b/CHANGELOG.md
index f64bce337..98d7f2bd6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -54,7 +54,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * `jj duplicate` and `jj abandon` can now take more than a single `-r` argument,
   for consistency with other commands.
 
-* `jj branch list` now allows combining `-r` and `-a` options.
+* `jj branch list` now allows combining `-r REVISIONS`/`NAMES` and `-a` options.
 
 * `--all` is now named `--all-remotes` for `jj branch list`
 
diff --git a/cli/src/commands/branch.rs b/cli/src/commands/branch.rs
index 48cb3464e..7892fbc96 100644
--- a/cli/src/commands/branch.rs
+++ b/cli/src/commands/branch.rs
@@ -97,7 +97,7 @@ pub struct BranchDeleteArgs {
 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", conflicts_with_all = ["names", "tracked"])]
+    #[arg(long, short, alias = "all")]
     all_remotes: bool,
 
     /// Show remote tracked branches only. Omits local Git-tracking branches by
diff --git a/cli/tests/test_branch_command.rs b/cli/tests/test_branch_command.rs
index aaf734c6b..eae3312b5 100644
--- a/cli/tests/test_branch_command.rs
+++ b/cli/tests/test_branch_command.rs
@@ -1130,6 +1130,11 @@ fn test_branch_list_filtered() {
 
     // Select branches by name, combined with --all-remotes
     test_env.jj_cmd_ok(&local_path, &["git", "export"]);
+    insta::assert_snapshot!(query(&["--all-remotes", "remote-rewrite"]), @r###"
+    remote-rewrite: xyxluytn e31634b6 (empty) rewritten
+      @git: xyxluytn e31634b6 (empty) rewritten
+      @origin (ahead by 1 commits, behind by 1 commits): xyxluytn hidden 3e9a5af6 (empty) remote-rewrite
+    "###);
     insta::assert_snapshot!(query(&["--all-remotes", "-rbranches(remote-rewrite)"]), @r###"
     remote-rewrite: xyxluytn e31634b6 (empty) rewritten
       @git: xyxluytn e31634b6 (empty) rewritten