Merge branch 'maint'

* maint: Documentation: Describe other situations where -z affects git diff
git-mirror · Apr 19, 2010 · fab4502 · fab4502
2 parents e8a1228 + 03aa87e
commit fab4502
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
@@ -94,8 +94,8 @@ Also, when `--raw` or `--numstat` has been given, do not munge
 pathnames and use NULs as output field terminators.
 endif::git-log[]
 ifndef::git-log[]
-	When `--raw` or `--numstat` has been given, do not munge
-	pathnames and use NULs as output field terminators.
+	When `--raw`, `--numstat`, `--name-only` or `--name-status` has been
+	given, do not munge pathnames and use NULs as output field terminators.
 endif::git-log[]
 +
 Without this option, each pathname output will have TAB, LF, double quotes,