Fix over-simplified documentation for 'git log -z'
In commit 64485b4a, the documentation for 'git log -z' was simplified too much. The -z option actually changes the behavior of 'git log' in two ways: commits will be ended with a NUL instead of a LF (correctly documented) and the --raw and --numstat will have NUL as field terminators (omitted in the documentation for 'git log'). Signed-off-by: Björn Gustavsson <bgustavsson@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Björn Gustavsson committed
Nov 23, 2009 at 08:40 UTC
5c931c8da2db4a8e0b5713e97cce474b6596e2ff
1 file changed
+7
-5
Documentation/diff-options.txt
+7
-5
@@ -87,19 +87,21 @@ endif::git-format-patch[]
87
ifndef::git-format-patch[]
88
89
-z::
90
+ifdef::git-log[]
91
+ Separate the commits with NULs instead of with new newlines.
92
++
93
+Also, when `--raw` or `--numstat` has been given, do not munge
94
+pathnames and use NULs as output field terminators.
95
+endif::git-log[]
96
ifndef::git-log[]
97
When `--raw` or `--numstat` has been given, do not munge
98
pathnames and use NULs as output field terminators.
99
+endif::git-log[]
100
+
101
Without this option, each pathname output will have TAB, LF, double quotes,
102
and backslash characters replaced with `\t`, `\n`, `\"`, and `\\`,
103
respectively, and the pathname will be enclosed in double quotes if
104
any of those replacements occurred.
98
-endif::git-log[]
99
-
100
-ifdef::git-log[]
101
- Separate the commits with NULs instead of with new newlines.
102
-endif::git-log[]
105
106
--name-only::
107
Show only names of changed files.