diff --git a/CHANGELOG.md b/CHANGELOG.md
index a45ad9c24..1b7f3aea8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -54,6 +54,8 @@ 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.
+
 ### Fixed bugs
 
 ## [0.15.1] - 2024-03-06
diff --git a/cli/src/commands/branch.rs b/cli/src/commands/branch.rs
index 7417abd5a..831dca35b 100644
--- a/cli/src/commands/branch.rs
+++ b/cli/src/commands/branch.rs
@@ -98,7 +98,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, conflicts_with_all = ["names", "revisions", "tracked"])]
+    #[arg(long, short, conflicts_with_all = ["names", "tracked"])]
     all: 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 decf83f0d..740064085 100644
--- a/cli/tests/test_branch_command.rs
+++ b/cli/tests/test_branch_command.rs
@@ -1128,6 +1128,14 @@ fn test_branch_list_filtered() {
       @origin (ahead by 1 commits, behind by 1 commits): xyxluytn hidden 3e9a5af6 (empty) remote-rewrite
     "###);
 
+    // Select branches by name, combined with --all
+    test_env.jj_cmd_ok(&local_path, &["git", "export"]);
+    insta::assert_snapshot!(query(&["--all", "-rbranches(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
+    "###);
+
     // Can select deleted branch by name pattern, but not by revset.
     insta::assert_snapshot!(query(&["remote-delete"]), @r###"
     remote-delete (deleted)