diff --git a/git-diff-script b/git-diff-script
index 673853b9ce..020816bbf0 100755
--- a/git-diff-script
+++ b/git-diff-script
@@ -1,6 +1,7 @@
 #!/bin/sh
 rev=($(git-rev-parse --revs-only "$@"))
-flags=($(git-rev-parse --no-revs "$@"))
+flags=($(git-rev-parse --no-revs --flags "$@"))
+files=($(git-rev-parse --no-revs --no-flags "$@"))
 case "${#rev[*]}" in
 0)
 	git-diff-files -M -p "$@";;
@@ -9,7 +10,7 @@ case "${#rev[*]}" in
 2)
 	begin=$(echo "${rev[1]}" | tr -d '^')
 	end="${rev[0]}"
-	git-diff-tree -M -p $flags $begin $end;;
+	git-diff-tree -M -p $flags $begin $end $files;;
 *)
 	echo "I don't understand"
 	exit 1;;