From 4f2b3b644cefb27b9cd6db6ab1b47d1678d4574c Mon Sep 17 00:00:00 2001 From: josh11b <15258583+josh11b@users.noreply.github.com> Date: Sun, 17 May 2026 16:03:22 -0700 Subject: [PATCH] Support jj workspaces in suggested jj abandon-untagged alias (#7222) `@` refers to the current workspace's working copy, but if we want the command to respect the working copies of other workspaces, we should use `working_copies()` instead; see https://docs.jj-vcs.dev/latest/revsets/#functions . Also remove `all() &` while here, since it is always redundant. Assisted-by: Google Antigravity Co-authored-by: Josh L --- docs/project/contribution_tools.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/project/contribution_tools.md b/docs/project/contribution_tools.md index 30471016bef3..a26ce3320c34 100644 --- a/docs/project/contribution_tools.md +++ b/docs/project/contribution_tools.md @@ -261,7 +261,7 @@ If you use `jj`, you may find the following configuration snippets (added to ```sh # Clean up untracked or abandoned commits. -jj config set --user aliases.abandon-untagged '["abandon", "all() & ~ancestors(@ | bookmarks() | remote_bookmarks())"]' +jj config set --user aliases.abandon-untagged '["abandon", "~ancestors(working_copies() | bookmarks() | remote_bookmarks())"]' # Use Git-style conflict markers, which VS Code can provide merge support for. jj config set --user ui.conflict-marker-style 'git'