diff --git a/ChangeLog b/ChangeLog
index 2143d9fcb..3ceb2aa73 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2023-01-21  Bart Schaefer  <schaefer@zsh.org>
 
+	* 51313: Completion/Unix/Command/_git: fix "git rerere forget"
+
 	* 51310: Src/Zle/zle_main.c: zle -F handlers preserve LASTWIDGET
 
 2023-01-16  Peter Stephenson  <p.stephenson@samsung.com>
diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git
index 14fa01436..b3ed7b5c8 100644
--- a/Completion/Unix/Command/_git
+++ b/Completion/Unix/Command/_git
@@ -4259,14 +4259,14 @@ _git-rerere () {
 
   _arguments -C -S -s $endopt \
     '--rerere-autoupdate[register clean resolutions in index]' \
-    ': :->command' && ret=0
+    ': :->command' \
+    '*: :{ [[ $words[CURRENT-1] = forget ]] && __git_cached_files }' && ret=0
 
   case $state in
     (command)
-      # TODO: This isn't optimal, as forget get confused.
       _values command \
         'clear[reset metadata used by rerere]' \
-        'forget[resets metadata used by rerere for specific conflict]: :__git_cached_files' \
+        'forget[resets metadata used by rerere for specific conflict]' \
         'diff[output diffs for the current state of the resolution]' \
         'status[print paths with conflicts whose merge resolution rerere will record]' \
         'remaining[print paths with conflicts that have not been autoresolved by rerere]' \