Merge branch 'mg/use-default-abbrev-length-in-rev-list' into maint

diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index 8707d0e7404543d0565d72566a8db5946d9467ee..a1191d647bfb4685701e47de794bf14964de0088 100644 (file)
--- 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,