Merge branch 'maint'

* maint:
Documentation: Describe other situations where -z affects git diff

diff --combined Documentation/diff-options.txt
index 60e922e6eff888f83a92d3747579ef45d993528a,a1191d647bfb4685701e47de794bf14964de0088..c9c6c2b1cb61caa6db5e029d6bce1c76a6c075a7
--- 1/Documentation/diff-options.txt
--- 2/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@@ -94,8 -94,8 +94,8 @@@ Also, when `--raw` or `--numstat` has b
  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,
@@@ -117,14 -117,12 +117,14 @@@ any of those replacements occurred
        option and lists the commits in that commit range like the 'summary'
        option of linkgit:git-submodule[1] does.
  
 ---color::
 +--color[=<when>]::
        Show colored diff.
 +      The value must be always (the default), never, or auto.
  
  --no-color::
        Turn off colored diff, even when the configuration file
        gives the default to color output.
 +      Same as `--color=never`.
  
  --color-words[=<regex>]::
        Show colored word diff, i.e., color words which have changed.