From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 19 Apr 2010 04:31:20 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.7.1-rc2~5
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/fab45027e0cdf3ebdade137cb3740604da7bb4bc?ds=inline;hp=-c

Merge branch 'maint'

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

fab45027e0cdf3ebdade137cb3740604da7bb4bc
diff --combined Documentation/diff-options.txt
index 60e922e6ef,a1191d647b..c9c6c2b1cb
--- a/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.