diff --git a/share/completions/git.fish b/share/completions/git.fish
index e2f936382..e0c772cb4 100644
--- a/share/completions/git.fish
+++ b/share/completions/git.fish
@@ -82,7 +82,8 @@ end
 function __fish_git_heads
     set -l gitdir (__fish_git rev-parse --git-dir 2>/dev/null)
     or return # No git dir, no need to even test.
-    for head in HEAD FETCH_HEAD ORIG_HEAD MERGE_HEAD
+    for head in HEAD FETCH_HEAD ORIG_HEAD MERGE_HEAD REBASE_HEAD REVERT_HEAD \
+        CHERRY_PICK_HEAD BISECT_HEAD AUTO_MERGE
         if test -f $gitdir/$head
             echo $head
         end