summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--Completion/Unix/Command/_git3
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 271ed0d74..9dddc0c66 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,9 @@
 	* 23556: Completion/Unix/Command/_rrdtool: completion
 	for rrdtool.
 
+	* 23557: Completion/Unix/Command/_git: complete
+	filenames after 'git reset <revision>'.
+
 2007-06-12  Peter Stephenson  <p.w.stephenson@ntlworld.com>
 
 	* 23554: Doc/Zsh/mod_sched.yo, Doc/Zsh/params.yo,
diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git
index 7b76d5a90..4385a794d 100644
--- a/Completion/Unix/Command/_git
+++ b/Completion/Unix/Command/_git
@@ -865,7 +865,8 @@ _git-reset () {
     '(        --soft --hard)--mixed[like --soft but report what has not been updated (default)]' \
     '(--mixed        --hard)--soft[do not touch the index file nor the working tree]' \
     '(--mixed --soft       )--hard[match the working tree and index to the given tree]' \
-    ':commit-ish:__git_revisions' && ret=0
+    ':commit-ish:__git_revisions' \
+    '*:path:_files' && ret=0
 }
 
 _git-resolve () {