summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCharles Bailey <charles@hashpling.org>2010-04-18 19:28:17 +0100
committerJunio C Hamano <gitster@pobox.com>2010-04-18 13:43:53 -0700
commit03aa87ed9912a6beac1a23e69ef0b70e1589d3d0 (patch)
treec1d18f3e9295d755e8a556ab128550b5eafd9e0a
parent53b3c47d64b4294ae586d1daa04f9140dadd9ae6 (diff)
downloadgit-03aa87ed9912a6beac1a23e69ef0b70e1589d3d0.tar.gz
Documentation: Describe other situations where -z affects git diff
-z also alters the behaviour of --name-only and --name-status. Signed-off-by: Charles Bailey <charles@hashpling.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/diff-options.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index 8707d0e740..a1191d647b 100644
--- 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,