diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5fb2f58e0b..221e611fef 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -36,6 +36,11 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
   (inherit from parent; default), `full` (full working copy), or `empty` (the
   empty working copy).
 
+* A revset alias named `at` is now provided, which functions identically to the
+  working-copy symbol `@`. This symbol cannot conflict with any Change or Commit
+  ID, and may be used in places where `@` may require escaping, like the Windows
+  terminal.
+
 ### Fixed bugs
 
  * Fixed panic when parsing invalid conflict markers of a particular form.
diff --git a/cli/src/config/revsets.toml b/cli/src/config/revsets.toml
index 253e16778b..5aeebe12ed 100644
--- a/cli/src/config/revsets.toml
+++ b/cli/src/config/revsets.toml
@@ -22,3 +22,6 @@ latest(
 'immutable_heads()' = 'builtin_immutable_heads()'
 'immutable()' = '::(immutable_heads() | root())'
 'mutable()' = '~immutable()'
+
+# NOTE: for Windows users, who don't want to type `@ all the time
+'at' = '@'
diff --git a/docs/revsets.md b/docs/revsets.md
index 8eab38eee6..8bb67f8531 100644
--- a/docs/revsets.md
+++ b/docs/revsets.md
@@ -19,6 +19,10 @@ ID or a Git ref pointing to them).
 ## Symbols
 
 The `@` expression refers to the working copy commit in the current workspace.
+In places where the `@` symbol needs to be escaped, such as inside a Windows
+terminal, you may use the name `at` instead, which is identical to `@` and
+requires no quoting.
+
 Use `<workspace name>@` to refer to the working-copy commit in another
 workspace. Use `<name>@<remote>` to refer to a remote-tracking branch.